diff --git a/res/values-de/translatable.xml b/res/values-de/translatable.xml
index 642e9507..a43857e8 100644
--- a/res/values-de/translatable.xml
+++ b/res/values-de/translatable.xml
@@ -7,7 +7,7 @@
   <string name="settings">Einstellungen</string>
   <string name="library">Bibliothek</string>
   <string name="no_shuffle">Keine zufällige Wiedergabe</string>
-  <string name="shuffle_songs">Musikstücke zufällig wiedergeben</string>
+  <string name="shuffle_songs">Titel zufällig wiedergeben</string>
   <string name="shuffle_albums">Alben zufällig wiedergeben</string>
   <string name="no_repeat">Nicht wiederholen</string>
   <string name="repeat">Wiederholen</string>
@@ -19,6 +19,14 @@
   <string name="queue_cleared">Wiedergabereihe geleert.</string>
   <string name="cover_art">Cover</string>
   <string name="close_notification">Schließen-Benachrichtigung</string>
+  <string name="_genre">Genre</string>
+  <string name="_track">Titel</string>
+  <string name="_composer">Komponist</string>
+  <string name="_format">Format</string>
+  <string name="_title">Titel</string>
+  <string name="_artist">Künstler</string>
+  <string name="_album">Album</string>
+  <string name="_year">Jahr</string>
   <string name="choose_playlist_name">Namen der Wiedergabeliste auswählen</string>
   <string name="create">Erstellen</string>
   <string name="overwrite">Überschreiben</string>
@@ -51,6 +59,8 @@
   <string name="play_all">Alle abspielen</string>
   <string name="enqueue_all">Alle einreihen</string>
   <string name="all_songs">Alle Titel</string>
+  <string name="more_from_artist">Mehr vom Künstler</string>
+  <string name="more_from_album">Mehr aus dem Album</string>
   <string name="name">Name</string>
   <string name="number_of_tracks">Anzahl der Titel</string>
   <string name="year">Jahr</string>
@@ -62,22 +72,19 @@
   <string name="ascending">Aufsteigend</string>
   <string name="descending">Absteigend</string>
   <string name="notification_title_paused">%s (Angehalten)</string>
-  <string name="pref_output">Audioausgabe</string>
   <string name="volume_title">Lautstärke</string>
   <string name="media_button_title">Kopfhörer/Bluetooth-Steuerung</string>
   <string name="media_button_summary">Dies wird auch für die Steuerelemente der ICS-Bildschirmsperre benötigt.</string>
   <string name="headset_only_title">Nur externer Ausgang</string>
-  <string name="headset_only_summary">Verhindert die Ausgabe über den internen Lautsprecher.</string>
+  <string name="headset_only_summary">Verhindert, dass Musik über die internen Lautsprecher wiedergegeben wird.</string>
   <string name="headset_pause_title">Anhalten wenn nicht angeschlossen</string>
   <string name="headset_pause_summary">Anhalten, wenn die Kopfhörer entfernt werden.</string>
   <string name="headset_play_title">Abspielen beim anschließen</string>
   <string name="headset_play_summary">Abspielen wenn der Kopfhörer angeschlossen wurde. (Nur wenn der Dienst aktiv ist)</string>
-  <string name="pref_notifications">Benachrichtigungen</string>
   <string name="notification_mode_title">Benachrichtigungsmodus</string>
   <string name="notification_action_title">Benachrichtigungsaktion</string>
   <string name="notification_invert_color_title">Farbe der Benachrichtigung umkehren</string>
   <string name="notification_invert_color_summary">Text weiß statt schwarz anzeigen</string>
-  <string name="pref_playback_view">Ansicht der Wiedergabe</string>
   <string name="playback_on_startup_title">Beim Start öffnen</string>
   <string name="playback_on_startup_summary">Wiedergabeansicht beim Start anzeigen</string>
   <string name="display_mode_title">Anzeigemodus</string>
@@ -85,17 +92,14 @@
   <string name="swipe_down_action_title">Runter-Wisch Aktion</string>
   <string name="cover_press_action_title">Cover-Antippen Aktion</string>
   <string name="cover_longpress_action_title">Aktion bei langem Cover-Drücken</string>
-  <string name="pref_song_selector">Bibliotheksansicht</string>
   <string name="controls_in_selector_title">Steuerelemente in Bibliotheksansicht</string>
   <string name="controls_in_selector_summary">Zeige den aktuell gespielten Titel und die Steuerelemente in der Bibliotheksansicht</string>
   <string name="default_action_title">Standardaktion</string>
   <string name="default_playlist_action_title">Standard Wiedergabelisten-Aktion</string>
-  <string name="pref_shake">Schütteln (Beschleunigungssensor)</string>
   <string name="enable_shake_title">Beschleunigungssensor-Schütteln aktivieren</string>
   <string name="enable_shake_summary">Ist nur aktiv wenn Musik abgespielt wird. Funktioniert auf einigen Geräten nicht bei ausgeschaltetem Bildschirm.</string>
   <string name="shake_action_title">Aktion beim Schütteln</string>
   <string name="shake_threshold_title">Schwellwert beim Schütteln</string>
-  <string name="pref_misc">Sonstige Funktionen</string>
   <string name="disable_lockscreen_title">Bildschirmsperre deaktivieren</string>
   <string name="disable_lockscreen_summary">Bildschirmsperre verhindern wenn Bibliothek- oder Wiedergabeansicht aktiv</string>
   <string name="use_idle_timeout_title">Inaktivitäts-Zeitabschaltung aktivieren</string>
@@ -113,11 +117,14 @@
   <string name="tap_to_scan">Antippen, um externem Speicher nach Musik zu durchsuchen</string>
   <string name="scan_in_progress">Aktualisierung wird durchgeführt…</string>
   <string name="finished_scanning">Durchsuchen abgeschlossen. Antippen für erneute Suche.</string>
+  <string name="tabs">Tab-Reihenfolge</string>
+  <string name="customize_tab_order">Anpassen der Reihenfolge und Sichtbarkeit der Bibliothek-Tabs</string>
+  <string name="restore_default">Standard wiederherstellen</string>
   <string name="last_used_action">Zuletzt verwendete Aktion</string>
   <string name="never_show">Nie anzeigen</string>
   <string name="show_when_playing">Bei Wiedergabe anzeigen (Standard)</string>
   <string name="always_show">Immer anzeigen</string>
-  <string name="open_main_activity">Zur Startansicht (Standard)</string>
+  <string name="open_main_activity">Bibliothek öffnen (Standard)</string>
   <string name="open_mini_popup">Mini-popup öffnen</string>
   <string name="skip_to_next_song">Zum nächsten Titel springen</string>
   <string name="info_on_cover">Info auf dem Cover</string>
diff --git a/res/values-es/translatable.xml b/res/values-es/translatable.xml
index 1b1e9657..d133f791 100644
--- a/res/values-es/translatable.xml
+++ b/res/values-es/translatable.xml
@@ -59,13 +59,11 @@
   <string name="ascending">Ascendente</string>
   <string name="descending">Descendente</string>
   <string name="notification_title_paused">%s (en pausa)</string>
-  <string name="pref_output">Salida de audio</string>
   <string name="volume_title">Volumen</string>
   <string name="media_button_title">Auricular/Controles Bluetooth</string>
   <string name="media_button_summary">Esto es necesario para los controles del bloqueo de pantalla en ICS.</string>
   <string name="headset_only_title">Solo Señal Externa</string>
-  <string name="pref_notifications">Notificaciones</string>
-  <string name="pref_playback_view">Vista de reproducción</string>
+  <string name="headset_pause_title">Detener al Desconectar</string>
+  <string name="headset_pause_summary">Pausar cuando los auriculares son desconectados.</string>
   <string name="display_mode_title">Modo de visualización</string>
-  <string name="pref_song_selector">Vista de biblioteca</string>
 </resources>
diff --git a/res/values-hu/translatable.xml b/res/values-hu/translatable.xml
new file mode 100644
index 00000000..bf3440ed
--- /dev/null
+++ b/res/values-hu/translatable.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string name="app_name">Vanilla Music</string>
+  <string name="no_songs">Az eszközön nem találhatóak zeneszámok.</string>
+  <string name="settings">Beállítások</string>
+  <string name="library">Gyűjtemény</string>
+  <string name="no_repeat">Nincs ismétlés</string>
+  <string name="repeat">Ismétlés</string>
+  <string name="random">Véletlenszerű</string>
+  <string name="song_load_failed">Nem sikerült betölteni a %s dalt. Lehet sérült vagy hiányzik.</string>
+  <string name="_genre">műfaj</string>
+  <string name="_track">szám</string>
+  <string name="_format">formátum</string>
+  <string name="_title">cím</string>
+  <string name="_artist">előadó</string>
+  <string name="_album">album</string>
+  <string name="_year">év</string>
+  <string name="create">Létrehozás</string>
+  <string name="overwrite">Felülír</string>
+  <string name="cancel">Mégse</string>
+  <string name="delete_playlist">Törli a %s lejátszási listát?</string>
+  <string name="play">Lejátszás</string>
+  <string name="edit">Szerkesztés</string>
+  <string name="rename">Átnevezés</string>
+  <string name="add_to_playlist">Hozzáadás a lejátszólistához…</string>
+  <string name="new_playlist">Új lejátszólista…</string>
+  <string name="delete">Törlés</string>
+  <string name="playback_view">Most játszott</string>
+  <string name="sort_by">Rendezés</string>
+  <string name="search">Keresés</string>
+  <string name="done">Kész</string>
+  <string name="remove">Eltávolítás</string>
+  <string name="deleted">%s törölve.</string>
+  <string name="artists">Előadók</string>
+  <string name="albums">Albumok</string>
+  <string name="songs">Dalok</string>
+  <string name="playlists">Lejátszólisták</string>
+  <string name="genres">Műfajok</string>
+  <string name="files">Fájlok</string>
+  <string name="none">Nincs</string>
+  <string name="unknown">Ismeretlen</string>
+  <string name="all_songs">Minden dal</string>
+  <string name="name">Név</string>
+  <string name="year">Év</string>
+  <string name="artist_album">Előadó, album</string>
+  <string name="artist_album_title">Előadó, album, cím</string>
+  <string name="artist_year">Előadó, év</string>
+  <string name="ascending">Növekvő</string>
+  <string name="descending">Csökkenő</string>
+  <string name="volume_title">Hangerő</string>
+  <string name="media_button_title">Fejhallgató/Bluetooth-vezérlők</string>
+  <string name="headset_only_title">Csak külső kimenet</string>
+  <string name="notification_mode_title">Értesítési mód</string>
+  <string name="notification_action_title">Értesítési művelet</string>
+  <string name="notification_invert_color_summary">Fehér szöveg használata a fekete helyett</string>
+  <string name="display_mode_title">Megjelenítési mód</string>
+  <string name="default_action_title">Alapértelmezett művelet</string>
+  <string name="default_playlist_action_title">Alapértelmezett lejátszólista művelet</string>
+  <string name="disable_lockscreen_title">Képernyőzár letiltása</string>
+  <string name="use_idle_timeout_title">Üresjárati időtúllépés engedélyezése</string>
+  <string name="idle_timeout_title">Üresjárati időkorlát</string>
+  <string name="disable_cover_art_title">Albumborító letiltása</string>
+  <string name="scrobble_title">ScrobbleDroid API használata</string>
+  <string name="media_scan">Gyűjtemény frissítése</string>
+  <string name="scan_in_progress">Beolvasás folyamatban…</string>
+  <string name="tabs">Lapok sorrendje</string>
+  <string name="restore_default">Alapértelmezés visszaállítása</string>
+  <string name="last_used_action">Utoljára használt művelet</string>
+  <string name="open_library">Gyűjtemény megnyitása</string>
+  <string name="play_pause">Lejátszás/szünet</string>
+  <string name="next_song">Következő zeneszám</string>
+  <string name="previous_song">Előző zeneszám</string>
+  <string name="next_album">Következő album</string>
+  <string name="previous_album">Előző album</string>
+  <string name="clear_queue">Várólista törlése</string>
+  <plurals name="playing">
+    <item quantity="one">1 dal lejátszása.</item>
+    <item quantity="other">%d dalok lejátszása.</item>
+  </plurals>
+  <plurals name="deleted">
+    <item quantity="one">1 dal törölve.</item>
+    <item quantity="other">%d dal törölve.</item>
+  </plurals>
+  <plurals name="seconds">
+    <item quantity="one">1 másodperc</item>
+    <item quantity="other">%d másodperc</item>
+  </plurals>
+  <plurals name="minutes">
+    <item quantity="one">1 perc</item>
+    <item quantity="other">%d perc</item>
+  </plurals>
+  <plurals name="hours">
+    <item quantity="one">1 óra</item>
+    <item quantity="other">%d óra</item>
+  </plurals>
+</resources>
diff --git a/res/values-nl/translatable.xml b/res/values-nl/translatable.xml
new file mode 100644
index 00000000..b2decde1
--- /dev/null
+++ b/res/values-nl/translatable.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string name="settings">Instellingen</string>
+  <string name="library">Bibliotheek</string>
+  <string name="random">Willekeurig</string>
+  <string name="play">Speel</string>
+  <string name="edit">Wijzig</string>
+  <string name="rename">Hernoem</string>
+  <string name="add_to_playlist">Voeg toe aan Afspeellijst…</string>
+  <string name="new_playlist">Nieuwe Afspeellijst…</string>
+  <string name="delete">Verwijder</string>
+  <string name="search">Zoek</string>
+  <string name="done">Klaar</string>
+  <string name="artists">Artiesten</string>
+  <string name="albums">Albums</string>
+  <string name="files">Bestanden</string>
+  <string name="none">Geen</string>
+  <string name="unknown">Onbekend</string>
+  <string name="play_all">Speel alles</string>
+  <string name="name">Naam</string>
+</resources>
diff --git a/res/values-no/translatable.xml b/res/values-no/translatable.xml
index 283bd292..1e7b6da5 100644
--- a/res/values-no/translatable.xml
+++ b/res/values-no/translatable.xml
@@ -32,7 +32,6 @@
   <string name="play_all">Soill Alt</string>
   <string name="enqueue_all">Kø Alt</string>
   <string name="all_songs">Alle Låter</string>
-  <string name="pref_output">Lydutgang</string>
   <string name="volume_title">Volum</string>
   <string name="media_button_title">Bruk Hodetelefon Knapper</string>
   <string name="headset_only_title">Kun Ekstern Lydutgang</string>
@@ -40,22 +39,18 @@
   <string name="headset_pause_summary">Pause når hodetelefonen er frakoblet.</string>
   <string name="headset_play_title">Spill Når Tilkoblet</string>
   <string name="headset_play_summary">Spill når hodetelefonen er tilkoblet. (Fungerer bare når tjenesten kjører.)</string>
-  <string name="pref_notifications">Varsler</string>
   <string name="notification_mode_title">Varselmodus</string>
   <string name="notification_action_title">Varsel Handling</string>
   <string name="notification_invert_color_title">Inverter Varsling Farge</string>
   <string name="notification_invert_color_summary">Bruk hvit tekst i stedet for svart tekst</string>
-  <string name="pref_playback_view">Avspill Visning</string>
   <string name="display_mode_title">Visningsmodus</string>
   <string name="swipe_up_action_title">Sveip Opp Handling</string>
   <string name="swipe_down_action_title">Sveip Ned Handling</string>
   <string name="cover_press_action_title">Cover Tapp Handling</string>
   <string name="cover_longpress_action_title">Lang Cover Trykk Handling</string>
-  <string name="pref_song_selector">Bibliotek Visning</string>
   <string name="controls_in_selector_title">Medieknapper i Bibliotek</string>
   <string name="controls_in_selector_summary">Vis låten som spilles og mediekontrollene i biblioteket</string>
   <string name="default_action_title">Standard Handling</string>
-  <string name="pref_misc">Diverse Egenskaper</string>
   <string name="use_idle_timeout_title">Aktiver Tomgang</string>
   <string name="use_idle_timeout_summary">Når aktiv, blir avspillingen stoppet etter en gitt periode med inaktivitet</string>
   <string name="idle_timeout_title">Tomgang</string>
diff --git a/res/values-pt/translatable.xml b/res/values-pt/translatable.xml
index 99fbfd2c..9cf31712 100644
--- a/res/values-pt/translatable.xml
+++ b/res/values-pt/translatable.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app_name">Vanilla</string>
-  <string name="no_songs">Não foram encontradas faixas no dispositivo.</string>
-  <string name="empty_queue">Nenhuma faixa selecionada. Escolha-as na coleção ou ative o modo aleatório clicando nesta mensagem.</string>
+  <string name="app_name">Vanilla Music</string>
+  <string name="no_songs">Não foram encontradas faixas no dispositivo</string>
+  <string name="empty_queue">Nenhuma faixa selecionada. Escolha-as na coleção ou ative o modo aleatório clicando nesta mensagem</string>
   <string name="settings">Definições</string>
   <string name="library">Coleção</string>
   <string name="no_shuffle">Não baralhar</string>
@@ -15,10 +15,19 @@
   <string name="stop_current_song">Parar após a faixa atual</string>
   <string name="random">Aleatório</string>
   <string name="random_enabling">Modo aleatório ativo</string>
-  <string name="song_load_failed">Falha ao carregar %s. Pode estar danificada.</string>
-  <string name="queue_cleared">Fila apagada.</string>
+  <string name="song_load_failed">Falha ao carregar %s. Pode estar danificada</string>
+  <string name="queue_cleared">Fila apagada</string>
   <string name="cover_art">Capa de álbum</string>
+  <string name="vinyl_cover">Capa vinil</string>
   <string name="close_notification">Fechar notificação</string>
+  <string name="_genre">género</string>
+  <string name="_track">faixa</string>
+  <string name="_composer">compositor</string>
+  <string name="_format">formato</string>
+  <string name="_title">título</string>
+  <string name="_artist">artista</string>
+  <string name="_album">álbum</string>
+  <string name="_year">ano</string>
   <string name="choose_playlist_name">Escolha o nome da lista de reprodução</string>
   <string name="create">Criar</string>
   <string name="overwrite">Substituir</string>
@@ -38,8 +47,8 @@
   <string name="done">Concluído</string>
   <string name="remove">Remover</string>
   <string name="clear_search">Apagar procura</string>
-  <string name="deleted">%s eliminada.</string>
-  <string name="delete_file_failed">Falha ao eliminar %s.</string>
+  <string name="deleted">%s eliminada</string>
+  <string name="delete_file_failed">Falha ao eliminar %s</string>
   <string name="artists">Artistas</string>
   <string name="albums">Álbuns</string>
   <string name="songs">Faixas</string>
@@ -51,6 +60,8 @@
   <string name="play_all">Reproduzir tudo</string>
   <string name="enqueue_all">Colocar tudo na fila</string>
   <string name="all_songs">Todas as faixas</string>
+  <string name="more_from_artist">Mias deste artista</string>
+  <string name="more_from_album">Mais deste álbum</string>
   <string name="name">Nome</string>
   <string name="number_of_tracks">Número de faixas</string>
   <string name="year">Ano</string>
@@ -59,26 +70,26 @@
   <string name="artist_album_track">Artista, álbum, n.º da faixa</string>
   <string name="artist_album_title">Artista, álbum, título</string>
   <string name="artist_year">Artista, ano</string>
-  <string name="ascending">Ascendente</string>
-  <string name="descending">Descendente</string>
+  <string name="ascending">Crescente</string>
+  <string name="descending">Decrescente</string>
   <string name="notification_title_paused">%s (em pausa)</string>
-  <string name="pref_output">Saída áudio</string>
+  <string name="audio">Áudio</string>
   <string name="volume_title">Volume</string>
   <string name="media_button_title">Auscultador/Bluetooth</string>
-  <string name="media_button_summary">Também é necessário pelo ecrã de bloqueio do ICS.</string>
+  <string name="media_button_summary">Também é necessário pelo ecrã de bloqueio do ICS</string>
   <string name="headset_only_title">Só saída externa</string>
-  <string name="headset_only_summary">Impede que as faixas sejam reproduzidas pelo altifalante.</string>
+  <string name="headset_only_summary">Impede que a música seja reproduzida pelo altifalante interno</string>
   <string name="headset_pause_title">Pausar ao retirar</string>
-  <string name="headset_pause_summary">Pausa se os auscultadores forem retirados.</string>
+  <string name="headset_pause_summary">Pausa se os auscultadores forem retirados</string>
   <string name="headset_play_title">Reproduzir ao ligar</string>
   <string name="headset_play_summary">Reproduzir ao ligar os auscultadores (só funciona se o serviço estiver em execução)
 </string>
-  <string name="pref_notifications">Notificações</string>
+  <string name="notifications">Notificações</string>
   <string name="notification_mode_title">Modo de notificação</string>
   <string name="notification_action_title">Ação de notificação</string>
   <string name="notification_invert_color_title">Trocar cor da notificação</string>
   <string name="notification_invert_color_summary">Texto branco em vez de preto</string>
-  <string name="pref_playback_view">Vista de reprodução</string>
+  <string name="playback_screen">Ecrã de reprodução</string>
   <string name="playback_on_startup_title">Abrir ao iniciar</string>
   <string name="playback_on_startup_summary">Abrir vista de reprodução ao iniciar</string>
   <string name="display_mode_title">Modo de exibição</string>
@@ -86,17 +97,17 @@
   <string name="swipe_down_action_title">Ao mover para baixo</string>
   <string name="cover_press_action_title">Ao tocar na capa</string>
   <string name="cover_longpress_action_title">Ao clique longo na capa</string>
-  <string name="pref_song_selector">Vista de coleção</string>
+  <string name="library_screen">Ecrã da coleção</string>
   <string name="controls_in_selector_title">Controlos na coleção</string>
   <string name="controls_in_selector_summary">Mostrar a faixa em reprodução e os controlos na coleção</string>
   <string name="default_action_title">Ação padrão</string>
   <string name="default_playlist_action_title">Ação padrão da lista de reprodução</string>
-  <string name="pref_shake">Acelerador ao agitar</string>
+  <string name="accelerometer_shake">Acelerador ao agitar</string>
   <string name="enable_shake_title">Ativar acelerador</string>
-  <string name="enable_shake_summary">Só se estiver a ouvir músicas. Em alguns casos, não funciona se o ecrã estiver inativo.</string>
+  <string name="enable_shake_summary">Só se estiver a ouvir músicas. Em alguns casos, não funciona se o ecrã estiver inativo</string>
   <string name="shake_action_title">Ação ao agitar</string>
   <string name="shake_threshold_title">Limite da agitação</string>
-  <string name="pref_misc">Funções diversas</string>
+  <string name="misc_features">Funções diversas</string>
   <string name="disable_lockscreen_title">Desligar ecrã de bloqueio</string>
   <string name="disable_lockscreen_summary">Impede que o ecrã de bloqueio ative, se na vista de reprodução ou coleção</string>
   <string name="use_idle_timeout_title">Terminar reprodução</string>
@@ -105,20 +116,24 @@
   <string name="disable_cover_art_title">Não mostrar capa</string>
   <string name="disable_cover_art_summary">Impede o carregamento da capa em qualquer lugar</string>
   <string name="double_tap_title">Widget toque duplo</string>
-  <string name="double_tap_summary">Ao tocar duas vezes no widget 1x1, abre o reprodutor. Tem um atraso de 400ms antes que o widget responda às ações.</string>
+  <string name="double_tap_summary">Ao tocar duas vezes no widget 1x1, abre o reprodutor. Tem um atraso de 400ms antes que o widget responda às ações</string>
   <string name="scrobble_title">Usar ScrobbleDroid API</string>
   <string name="scrobble_summary">Enviar para a Last.FM via ScrobbleDroid ou Last.FM Scrobbler</string>
   <string name="stock_broadcast_title">Emular comunicações</string>
-  <string name="stock_broadcast_summary">Enviar difusões emulando as enviadas pelo leitor de origem, para trabalhar com controlos e widgets de terceiros.</string>
+  <string name="stock_broadcast_summary">Enviar difusões emulando as enviadas pelo leitor de origem, para trabalhar com controlos e widgets de terceiros</string>
   <string name="media_scan">Atualizar coleção</string>
   <string name="tap_to_scan">Toque para analisar as faixas no disco externo</string>
   <string name="scan_in_progress">A analisar...</string>
-  <string name="finished_scanning">Análise terminada. Toque para analisar novamente.</string>
+  <string name="finished_scanning">Análise terminada. Toque para analisar novamente</string>
+  <string name="about">Sobre</string>
+  <string name="tabs">Separadores</string>
+  <string name="customize_tab_order">Ajuste a ordem e visibilidade dos separadores</string>
+  <string name="restore_default">Restaurar padrões</string>
   <string name="last_used_action">Última ação utilizada</string>
   <string name="never_show">Nunca mostrar</string>
   <string name="show_when_playing">Mostrar ao reproduzir (padrão)</string>
   <string name="always_show">Mostrar sempre</string>
-  <string name="open_main_activity">Abrir atividade principal (padrão)</string>
+  <string name="open_main_activity">Abrir coleção (padrão)</string>
   <string name="open_mini_popup">Abrir alerta pequeno</string>
   <string name="skip_to_next_song">Ir para a faixa seguinte</string>
   <string name="info_on_cover">Informações na capa</string>
@@ -140,19 +155,19 @@
   <string name="toggle_controls">Comutar controlos</string>
   <plurals name="playing">
     <item quantity="one">A reproduzir 1 faixa.</item>
-    <item quantity="other">A reproduzir %d faixas.</item>
+    <item quantity="other">A reproduzir %d faixas</item>
   </plurals>
   <plurals name="enqueued">
-    <item quantity="one">1 faixa na fila.</item>
-    <item quantity="other">%d faixas na fila.</item>
+    <item quantity="one">1 faixa na fila</item>
+    <item quantity="other">%d faixas na fila</item>
   </plurals>
   <plurals name="added_to_playlist">
-    <item quantity="one">1 faixa adicionada à lista %2$s.</item>
+    <item quantity="one">1 faixa adicionada à lista %2$s</item>
     <item quantity="other">%1$d faixas adicionadas à lista %2$s.</item>
   </plurals>
   <plurals name="deleted">
-    <item quantity="one">1 faixa eliminada.</item>
-    <item quantity="other">%d 1 faixas eliminadas.</item>
+    <item quantity="one">1 faixa eliminada</item>
+    <item quantity="other">%d 1 faixas eliminadas</item>
   </plurals>
   <plurals name="seconds">
     <item quantity="one">1 segundo</item>
diff --git a/res/values-ru/translatable.xml b/res/values-ru/translatable.xml
index 2b1702d9..dab90a54 100644
--- a/res/values-ru/translatable.xml
+++ b/res/values-ru/translatable.xml
@@ -59,33 +59,27 @@
   <string name="ascending">По возрастанию</string>
   <string name="descending">По убыванию</string>
   <string name="notification_title_paused">%s (приостановлено)</string>
-  <string name="pref_output">Аудио выход</string>
   <string name="volume_title">Громкость</string>
   <string name="media_button_title">Гарнитура / Bluetooth управление</string>
   <string name="media_button_summary">Это также необходимо для ICS Экрана блокировки элементов управления.</string>
   <string name="headset_only_title">Только внешний выход</string>
-  <string name="headset_only_summary">Предотвращает проигрывание музыки через громкоговорители.</string>
   <string name="headset_pause_title">Пауза при не подключенной</string>
   <string name="headset_pause_summary">Пауза, когда наушники отключены.</string>
   <string name="headset_play_title">Играть при подключении</string>
   <string name="headset_play_summary">Проигрывать, когда подключены наушники в разъем (работает только, когда она запущена служба.)</string>
-  <string name="pref_notifications">Уведомления</string>
   <string name="notification_mode_title">Режим уведомлений</string>
   <string name="notification_action_title">Действия уведомлений</string>
   <string name="notification_invert_color_title">Инвертировать цвет уведомлений</string>
   <string name="notification_invert_color_summary">Использовать белый текст вместо черного текста</string>
-  <string name="pref_playback_view">Просмотр воспроизведения</string>
   <string name="display_mode_title">Режим отображения</string>
   <string name="swipe_up_action_title">Перелистывание вверх</string>
   <string name="swipe_down_action_title">Перелистывание вниз</string>
   <string name="cover_press_action_title">Действие при нажатие на Обложку</string>
   <string name="cover_longpress_action_title">Обложка при длительном нажатие</string>
-  <string name="pref_song_selector">Просмотреть библиотеку</string>
   <string name="controls_in_selector_title">Управление в библиотекой</string>
   <string name="controls_in_selector_summary">Показать информацию о проигрываемой композиции и управление мультимедиа в просматриваемой библиотеке</string>
   <string name="default_action_title">Действия по умолчанию</string>
   <string name="default_playlist_action_title">Плей-лист по умолчанию</string>
-  <string name="pref_misc">Другие возможности</string>
   <string name="disable_lockscreen_title">Отключить блокировку</string>
   <string name="use_idle_timeout_title">Включите тайм-аут простоя</string>
   <string name="use_idle_timeout_summary">Воспроизведение остановится после определенного периода бездействия</string>
@@ -102,7 +96,6 @@
   <string name="never_show">Никогда не показывать</string>
   <string name="show_when_playing">Показать при воспроизведении (по умолчанию)</string>
   <string name="always_show">Всегда показывать</string>
-  <string name="open_main_activity">Открыть основной (по умолчанию)</string>
   <string name="open_mini_popup">Открыть мини-меню</string>
   <string name="skip_to_next_song">Переход к следующей песне</string>
   <string name="info_on_cover">Информация о обложки</string>
diff --git a/res/values-sk/translatable.xml b/res/values-sk/translatable.xml
index 117a5fb3..d1a62d35 100644
--- a/res/values-sk/translatable.xml
+++ b/res/values-sk/translatable.xml
@@ -32,7 +32,6 @@
   <string name="play_all">Prehrať všetko</string>
   <string name="enqueue_all">Pridať do zoznamu všetko</string>
   <string name="all_songs">Všetky skladby</string>
-  <string name="pref_output">Zvukový výstup</string>
   <string name="volume_title">Hlasitosť</string>
   <string name="media_button_title">Použiť ovládanie náhlavnej súpravy</string>
   <string name="headset_only_title">Iba externý výstup</string>
@@ -40,22 +39,18 @@
   <string name="headset_pause_summary">Pozastaví prehrávanie keď odpojíte sluchátka.</string>
   <string name="headset_play_title">Prehrať po pripojení</string>
   <string name="headset_play_summary">Spustí prehrávanie keď zapojíte sluchátka. Funguje iba keď beží služba.</string>
-  <string name="pref_notifications">Upozornenia</string>
   <string name="notification_mode_title">Režim upozornení</string>
   <string name="notification_action_title">Akcia upozornenia</string>
   <string name="notification_invert_color_title">Invertovať farbu oznámenia</string>
   <string name="notification_invert_color_summary">Použije biely text namiesto čierneho.</string>
-  <string name="pref_playback_view">Zobrazenie prehrávania</string>
   <string name="display_mode_title">Režim zobrazenia</string>
   <string name="swipe_up_action_title">Akcia prejedním prstu nahor</string>
   <string name="swipe_down_action_title">Prejdením prstom nadol</string>
   <string name="cover_press_action_title">Akcia pri ťuknutí na obal</string>
   <string name="cover_longpress_action_title">Akcia pri podržaní na obale</string>
-  <string name="pref_song_selector">Zobrazenie knižnice</string>
   <string name="controls_in_selector_title">Ovládanie v knižnici</string>
   <string name="controls_in_selector_summary">V knižnici zobrazí aktuálne prehrávanú skladbu a ovládanie prehrávania.</string>
   <string name="default_action_title">Predvolená akcia</string>
-  <string name="pref_misc">Ostatné funkcie</string>
   <string name="use_idle_timeout_title">Povoliť časový limit nečinnosti</string>
   <string name="use_idle_timeout_summary">Keď je povolené, prehrávanie sa zastaví po danom čase nečinnosti.</string>
   <string name="idle_timeout_title">Časový limit nečinnosti</string>
diff --git a/res/values-tr/translatable.xml b/res/values-tr/translatable.xml
index d74b79ac..12aed3a4 100644
--- a/res/values-tr/translatable.xml
+++ b/res/values-tr/translatable.xml
@@ -58,16 +58,12 @@
   <string name="ascending">Artan</string>
   <string name="descending">Azalan</string>
   <string name="notification_title_paused">%s (durduruldu)</string>
-  <string name="pref_output">Ses çıkışı</string>
   <string name="volume_title">Ses</string>
   <string name="media_button_title">Kulaklık / Bluetooth Kontrolleri</string>
   <string name="headset_play_title">Takılı çalışırken oynat</string>
-  <string name="pref_notifications">Uyarılar</string>
   <string name="notification_mode_title">Bildirim modu</string>
   <string name="notification_invert_color_summary">Siyah metin yerine beyaz metin kullanın</string>
-  <string name="pref_playback_view">Kayıttan yürütmeyi görüntüle</string>
   <string name="display_mode_title">Görüntü modu</string>
-  <string name="pref_song_selector">Kitaplığı gör</string>
   <string name="controls_in_selector_title">Kütüphane kontrolleri</string>
   <string name="default_action_title">Varsayılan işlem</string>
   <string name="disable_lockscreen_title">LockScreen devre dışı bırak</string>
diff --git a/res/values-uk/translatable.xml b/res/values-uk/translatable.xml
index 9c907f1b..88cc9099 100644
--- a/res/values-uk/translatable.xml
+++ b/res/values-uk/translatable.xml
@@ -40,10 +40,8 @@
   <string name="date_added">Дата додавання</string>
   <string name="artist_album">Виконавець, альбом</string>
   <string name="artist_year">Виконавець, рік</string>
-  <string name="pref_output">Аудіо вихід</string>
   <string name="volume_title">Гучність</string>
   <string name="media_button_title">Гарнітура/Bluetooth керування</string>
-  <string name="pref_notifications">Сповіщення</string>
   <string name="media_scan">Оновити бібліотеку</string>
   <string name="open_library">Відкрити бібліотеку</string>
   <string name="play_pause">Відтворення/пауза</string>
diff --git a/update-translations.py b/update-translations.py
new file mode 100755
index 00000000..b7158de8
--- /dev/null
+++ b/update-translations.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+
+# Fetch the translations from http://crowdin.net/project/vanilla-music and save
+# them to res/ in the current directory. Removes files that contain no
+# translations and removes incomplete plurals (they cause crashes).
+#
+# This script does not force crowdin to rebuild the translation package. That
+# should be done through the website before running this script.
+#
+# Requires python-lxml.
+
+try:
+	# python 3
+	from urllib.request import urlopen
+except ImportError:
+	# python 2
+	from urllib2 import urlopen
+from lxml import etree
+from zipfile import ZipFile
+import io
+import os
+
+data = urlopen('http://crowdin.net/download/project/vanilla-music.zip')
+ar = ZipFile(io.BytesIO(data.read()))
+parser = etree.XMLParser(remove_blank_text=True)
+
+for name in ar.namelist():
+	# ignore directories
+	if not name.endswith('translatable.xml'):
+		continue
+
+	doc = etree.parse(ar.open(name), parser)
+	# remove plurals without "other" quantity (they cause crashes)
+	for e in doc.xpath("//plurals[not(item/@quantity='other')]"):
+		e.getparent().remove(e)
+
+	# ignore languages with no translations
+	if len(doc.getroot()) == 0:
+		continue
+
+	# make some translations more general
+	lang = name.split('/')[0]
+	if lang == 'es-ES':
+		lang = 'es'
+	# The Android convention seems to be to put pt-PT in values-pt-rPT and
+	# put pt-BR in values-pt. But since we have no pt-BR translation yet,
+	# I'm just putting pt-PT in values-pt for now. Hopefully this doesn't
+	# cause any issues.
+	elif lang == 'pt-PT':
+		lang = 'pt'
+
+	# create dir if needed (assume res/ exists already)
+	path = 'res/values-' + lang
+	if not (os.path.isdir(path)):
+		os.mkdir(path)
+
+	# save result
+	with io.open(path + "/translatable.xml", "w") as file:
+		file.write(etree.tostring(doc, encoding='unicode', pretty_print=True, doctype='<?xml version="1.0" encoding="utf-8"?>'))