diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts
index 2435cd3bf..d73227cb4 100644
--- a/lang/tomahawk_es.ts
+++ b/lang/tomahawk_es.ts
@@ -4,82 +4,77 @@
 <context>
     <name>ActionCollection</name>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="41"/>
         <source>&amp;Listen Along</source>
         <translation>&amp;Escuchar juntos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="44"/>
         <source>&amp;Stop Listening Along</source>
-        <translation>&amp;Detener la reproducción conjunta</translation>
+        <translation type="obsolete">&amp;Detener la reproducción conjunta</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="54"/>
         <source>&amp;Load Playlist</source>
         <translation>&amp;Cargar lista de reproducción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="55"/>
         <source>&amp;Rename Playlist</source>
         <translation>&amp;Renombrar lista de reproducción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="56"/>
         <source>&amp;Copy Playlist Link</source>
         <translation>&amp;Copiar enlace de lista de reproducción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="57"/>
         <source>&amp;Play</source>
         <translation>&amp;Reproducir</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="58"/>
         <source>&amp;Stop</source>
         <translation>&amp;Detener</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="59"/>
         <source>&amp;Previous Track</source>
         <translation>&amp;Pista anterior</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="60"/>
         <source>&amp;Next Track</source>
         <translation>&amp;Pista siguiente</translation>
     </message>
     <message>
-        <location filename="libtomahawk/actioncollection.cpp" line="61"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
+    <message>
+        <source>Stop &amp;Listening Along</source>
+        <translation>Detener la &amp;reproducción conjunta</translation>
+    </message>
+    <message>
+        <source>&amp;Listen Privately</source>
+        <translation>&amp;Escuchar en privado</translation>
+    </message>
+    <message>
+        <source>&amp;Listen Publicly</source>
+        <translation>&amp;Escuchar públicamente</translation>
+    </message>
 </context>
 <context>
     <name>AlbumInfoWidget</name>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
         <source>Other Albums by Artist</source>
         <translation>Otros álbumes por el artista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="71"/>
-        <location filename="libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="116"/>
         <source>Click to show Super Collection Tracks</source>
         <translation>Mostrar pistas de la Súper Colección</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="73"/>
-        <location filename="libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="118"/>
         <source>Click to show Official Tracks</source>
-        <translation>Mostrar pistas oficiales</translation>
+        <translation>Mostrar Pistas Oficiales</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="174"/>
         <source>Other Albums by %1</source>
         <translation>Otros álbumes por %1</translation>
     </message>
@@ -87,143 +82,138 @@
 <context>
     <name>AlbumModel</name>
     <message>
-        <location filename="libtomahawk/playlist/albummodel.cpp" line="152"/>
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/albummodel.cpp" line="256"/>
-        <location filename="libtomahawk/playlist/albummodel.cpp" line="282"/>
         <source>All albums from %1</source>
         <translation>Todos los álbumes de %1</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/albummodel.cpp" line="284"/>
         <source>All albums</source>
         <translation>Todos los álbumes</translation>
     </message>
 </context>
+<context>
+    <name>AlbumView</name>
+    <message>
+        <source>After you have scanned your music collection you will find your latest album additions right here.</source>
+        <translation>Tras haber escaneado su colección aquí encontrará los últimos álbumes añadidos.</translation>
+    </message>
+    <message>
+        <source>This collection doesn&apos;t have any recent albums.</source>
+        <translation>Esta colección no tiene álbumes recientes.</translation>
+    </message>
+</context>
 <context>
     <name>ArtistInfoWidget</name>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="37"/>
         <source>Top Hits</source>
         <translation>Grandes éxitos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="55"/>
         <source>Related Artists</source>
         <translation>Artistas relacionados</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="77"/>
         <source>Albums</source>
         <translation>Álbumes</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/>
-        <location filename="libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="118"/>
         <source>Click to show All Releases</source>
-        <translation>Mostrar todos los lanzamientos</translation>
+        <translation type="obsolete">Mostrar todos los lanzamientos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="120"/>
         <source>Click to show Official Releases</source>
         <translation>Mostrar lanzamientos oficiales</translation>
     </message>
+    <message>
+        <source>Click to show Super Collection Albums</source>
+        <translation>Mostrar álbumes de la Super Colección</translation>
+    </message>
 </context>
 <context>
     <name>ArtistView</name>
     <message>
-        <location filename="libtomahawk/playlist/artistview.cpp" line="217"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Tu filtro &apos;%1&apos; no reportó ningún resultado.</translation>
     </message>
+    <message>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation>Tras haber escaneado su colección aquí encontrará las últimas pistas añadidas.</translation>
+    </message>
+    <message>
+        <source>This collection is currently empty.</source>
+        <translation>Esta colección está vacía.</translation>
+    </message>
 </context>
 <context>
     <name>AudioControls</name>
     <message>
-        <location filename="audiocontrols.ui" line="32"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation type="obsolete">Form</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="78"/>
         <source>Prev</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="90"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="97"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="106"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="168"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="obsolete">TextLabel</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="220"/>
         <source>Artist</source>
         <translation>Artista</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="242"/>
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="271"/>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="308"/>
         <source>love</source>
         <translation>favorita</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="352"/>
         <source>Time</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="378"/>
         <source>Time Left</source>
         <translation>Tiempo restante</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="453"/>
         <source>Shuffle</source>
         <translation>Aleatorio</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="466"/>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="504"/>
         <source>Low</source>
         <translation>Bajar volumen</translation>
     </message>
     <message>
-        <location filename="audiocontrols.ui" line="536"/>
         <source>High</source>
         <translation>Subir volumen</translation>
     </message>
@@ -231,36 +221,29 @@
 <context>
     <name>AudioEngine</name>
     <message>
-        <location filename="libtomahawk/audio/audioengine.cpp" line="380"/>
         <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
         <translation>Tomahawk está reproduciendo &quot;%1&quot; de %2%3.</translation>
     </message>
     <message>
-        <location filename="libtomahawk/audio/audioengine.cpp" line="383"/>
         <source> on album %1</source>
         <translation> en el álbum %1</translation>
     </message>
+    <message>
+        <source>Tomahawk is stopped.</source>
+        <translation>Tomahawk está parado.</translation>
+    </message>
 </context>
 <context>
     <name>CategoryAddItem</name>
     <message>
-        <location filename="sourcetree/items/categoryitems.cpp" line="58"/>
-        <location filename="sourcetree/items/categoryitems.cpp" line="97"/>
         <source>New Playlist</source>
         <translation>Nueva lista de reproducción</translation>
     </message>
     <message>
-        <location filename="sourcetree/items/categoryitems.cpp" line="60"/>
-        <location filename="sourcetree/items/categoryitems.cpp" line="203"/>
-        <location filename="sourcetree/items/categoryitems.cpp" line="312"/>
-        <location filename="sourcetree/items/categoryitems.cpp" line="314"/>
         <source>New Station</source>
         <translation>Nueva estación</translation>
     </message>
     <message>
-        <location filename="sourcetree/items/categoryitems.cpp" line="203"/>
-        <location filename="sourcetree/items/categoryitems.cpp" line="312"/>
-        <location filename="sourcetree/items/categoryitems.cpp" line="314"/>
         <source>%1 Station</source>
         <translation>%1 estación</translation>
     </message>
@@ -268,12 +251,10 @@
 <context>
     <name>CategoryItem</name>
     <message>
-        <location filename="sourcetree/items/categoryitems.h" line="62"/>
         <source>Playlists</source>
         <translation>Listas de reproducción</translation>
     </message>
     <message>
-        <location filename="sourcetree/items/categoryitems.h" line="64"/>
         <source>Stations</source>
         <translation>Estaciones</translation>
     </message>
@@ -281,7 +262,6 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="libtomahawk/playlist/topbar/clearbutton.cpp" line="38"/>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
@@ -289,12 +269,10 @@
 <context>
     <name>CollectionFlatModel</name>
     <message>
-        <location filename="libtomahawk/playlist/collectionflatmodel.cpp" line="84"/>
         <source>My Collection</source>
         <translation>Mi colección</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/collectionflatmodel.cpp" line="86"/>
         <source>Collection of %1</source>
         <translation>Colección de %1</translation>
     </message>
@@ -302,33 +280,27 @@
 <context>
     <name>CollectionItem</name>
     <message>
-        <location filename="sourcetree/items/collectionitem.cpp" line="52"/>
         <source>Top Loved Tracks</source>
         <translation>Pistas favoritas</translation>
     </message>
     <message>
-        <location filename="sourcetree/items/collectionitem.cpp" line="52"/>
         <source>Loved Tracks</source>
-        <translation>Pistas que me gustan</translation>
+        <translation>Pistas favoritas</translation>
     </message>
     <message>
-        <location filename="sourcetree/items/collectionitem.cpp" line="63"/>
         <source>Dashboard</source>
         <translatorcomment>Es díficil la traducción de &apos;Dashboard&apos;, pero Escritorio me parece mejor que otras posibles traducciones como Tablero de mandos o Panel.</translatorcomment>
         <translation>Escritorio</translation>
     </message>
     <message>
-        <location filename="sourcetree/items/collectionitem.cpp" line="69"/>
         <source>Charts</source>
         <translation>Listas de éxitos</translation>
     </message>
     <message>
-        <location filename="sourcetree/items/collectionitem.cpp" line="88"/>
         <source>New Additions</source>
         <translation>Añadido recientemente</translation>
     </message>
     <message>
-        <location filename="sourcetree/items/collectionitem.cpp" line="148"/>
         <source>Super Collection</source>
         <translation>Súper Colección</translation>
     </message>
@@ -336,7 +308,6 @@
 <context>
     <name>CollectionView</name>
     <message>
-        <location filename="libtomahawk/playlist/collectionview.cpp" line="84"/>
         <source>This collection is empty.</source>
         <translation>Esta colección está vacía.</translation>
     </message>
@@ -344,18 +315,14 @@
 <context>
     <name>ContextWidget</name>
     <message>
-        <location filename="libtomahawk/context/ContextWidget.ui" line="26"/>
         <source>InfoBar</source>
         <translation>InfoBar</translation>
     </message>
     <message>
-        <location filename="libtomahawk/context/ContextWidget.ui" line="38"/>
-        <location filename="libtomahawk/context/ContextWidget.cpp" line="286"/>
         <source>Show Footnotes</source>
         <translation>Mostrar información de contexto</translation>
     </message>
     <message>
-        <location filename="libtomahawk/context/ContextWidget.cpp" line="280"/>
         <source>Hide Footnotes</source>
         <translation>Ocultar información de contexto</translation>
     </message>
@@ -363,43 +330,34 @@
 <context>
     <name>CrashReporter</name>
     <message>
-        <location filename="breakpad/CrashReporter/CrashReporter.ui" line="23"/>
         <source>Tomahawk Crash Reporter</source>
         <translation>Reportador de fallos de Tomahawk</translation>
     </message>
     <message>
-        <location filename="breakpad/CrashReporter/CrashReporter.ui" line="80"/>
         <source>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;¡Ups!&lt;/b&gt;&amp;nbsp;Tomahawk ha fallado. La información acerca del fallo se enviará a Tomahawk HQ para que podamos solucionar el error.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="breakpad/CrashReporter/CrashReporter.ui" line="172"/>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <location filename="breakpad/CrashReporter/CrashReporter.ui" line="192"/>
         <source>You can disable sending crash reports in the configuration dialog.</source>
         <translation>Puede desactivar el envío de informes de error en el diálogo de configuración.</translation>
     </message>
     <message>
-        <location filename="breakpad/CrashReporter/CrashReporter.cpp" line="153"/>
         <source>Uploaded %L1 of %L2 KB.</source>
         <translation>Subidos %L1 of %L2 KBs.</translation>
     </message>
     <message>
-        <location filename="breakpad/CrashReporter/CrashReporter.cpp" line="167"/>
-        <location filename="breakpad/CrashReporter/CrashReporter.cpp" line="183"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="breakpad/CrashReporter/CrashReporter.cpp" line="176"/>
         <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
         <translation>¡Enviado!&lt;b&gt;Muchas gracias&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
         <source>Failed to send crash info.</source>
         <translation>Error al enviar la información del fallo.</translation>
     </message>
@@ -407,7 +365,6 @@
 <context>
     <name>DatabaseCommand_AllAlbums</name>
     <message>
-        <location filename="libtomahawk/database/databasecommand_allalbums.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -415,17 +372,14 @@
 <context>
     <name>DiagnosticsDialog</name>
     <message>
-        <location filename="diagnosticsdialog.ui" line="20"/>
         <source>Tomahawk Diagnostics</source>
         <translation>Diagnósticos de Tomahawk</translation>
     </message>
     <message>
-        <location filename="diagnosticsdialog.ui" line="38"/>
         <source>Update</source>
         <translation>Actualizar</translation>
     </message>
     <message>
-        <location filename="diagnosticsdialog.ui" line="45"/>
         <source>Copy to Clipboard</source>
         <translation>Copiar al portapapeles</translation>
     </message>
@@ -433,49 +387,38 @@
 <context>
     <name>GetNewStuffDelegate</name>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="61"/>
         <source>Installed</source>
         <translation>Instalado</translation>
     </message>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="61"/>
-        <location filename="GetNewStuffDelegate.cpp" line="122"/>
         <source>Installing</source>
         <translation>Instalando</translation>
     </message>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="61"/>
-        <location filename="GetNewStuffDelegate.cpp" line="128"/>
         <source>Failed</source>
         <translation>Fallo</translation>
     </message>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="61"/>
         <source>Uninstalling</source>
         <translation>Desinstalando</translation>
     </message>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="119"/>
         <source>Install</source>
         <translation>Instalar</translation>
     </message>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="125"/>
         <source>Upgrading</source>
         <translation>Actualizando</translation>
     </message>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="131"/>
         <source>Uninstall</source>
         <translation>Desinstalar</translation>
     </message>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="134"/>
         <source>Upgrade</source>
         <translation>Actualizar</translation>
     </message>
     <message>
-        <location filename="GetNewStuffDelegate.cpp" line="220"/>
         <source>%1 downloads</source>
         <translation>%1 descargas</translation>
     </message>
@@ -483,7 +426,6 @@
 <context>
     <name>GetNewStuffDialog</name>
     <message>
-        <location filename="GetNewStuffDialog.ui" line="14"/>
         <source>Download New Resolvers</source>
         <translation>Descargar nuevos resolvedores</translation>
     </message>
@@ -491,7 +433,6 @@
 <context>
     <name>GlobalSearchWidget</name>
     <message>
-        <location filename="searchbox.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
@@ -499,27 +440,22 @@
 <context>
     <name>GoogleWrapper</name>
     <message>
-        <location filename="sip/jabber/googlewrapper/googlewrapper.cpp" line="46"/>
         <source>Configure this Google Account</source>
         <translation>Configurar la cuenta Google</translation>
     </message>
     <message>
-        <location filename="sip/jabber/googlewrapper/googlewrapper.cpp" line="47"/>
         <source>Google Address</source>
         <translation>Dirección de Google</translation>
     </message>
     <message>
-        <location filename="sip/jabber/googlewrapper/googlewrapper.cpp" line="48"/>
         <source>Enter your Google login to connect with your friends using Tomahawk!</source>
         <translation>¡Introduzca sus datos de inicio de sesión de Google para conectar con sus amigos que usen Tomahawk!</translation>
     </message>
     <message>
-        <location filename="sip/jabber/googlewrapper/googlewrapper.cpp" line="74"/>
         <source>Add Friend</source>
         <translation>Añadir amigo</translation>
     </message>
     <message>
-        <location filename="sip/jabber/googlewrapper/googlewrapper.cpp" line="75"/>
         <source>Enter Google Address:</source>
         <translation>Introduzca su dirección Google:</translation>
     </message>
@@ -527,25 +463,18 @@
 <context>
     <name>InfoBar</name>
     <message>
-        <location filename="libtomahawk/infobar/infobar.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Barra de información</translation>
     </message>
     <message>
-        <location filename="libtomahawk/infobar/infobar.ui" line="43"/>
-        <location filename="libtomahawk/infobar/infobar.ui" line="80"/>
-        <location filename="libtomahawk/infobar/infobar.ui" line="96"/>
-        <location filename="libtomahawk/infobar/infobar.ui" line="147"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="obsolete">TextLabel</translation>
     </message>
     <message>
-        <location filename="libtomahawk/infobar/infobar.cpp" line="85"/>
         <source>Automatically update</source>
         <translation>Actualizar automáticamente</translation>
     </message>
     <message>
-        <location filename="libtomahawk/infobar/infobar.cpp" line="93"/>
         <source>Filter...</source>
         <translation>Filtro...</translation>
     </message>
@@ -553,57 +482,46 @@
 <context>
     <name>JabberConfig</name>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="14"/>
         <source>Jabber Configuration</source>
         <translation>Configuración de Jabber</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="52"/>
         <source>Configure this Jabber account</source>
         <translation>Configurar esta cuenta de Jabber</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="89"/>
         <source>Enter your Jabber login to connect with your friends using Tomahawk!</source>
         <translation>¡Introduzca sus datos de inicio de sesión de Jabber para conectar con sus amigos que usen Tomahawk!</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="111"/>
         <source>Login Information</source>
         <translation>Información de login</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="131"/>
         <source>Jabber ID:</source>
         <translation>Jabeer ID:</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="147"/>
         <source>e.g. user@example.com</source>
         <translation>p. ej. usuario@ejemplo.com</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="160"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="188"/>
         <source>An account with this name already exists!</source>
         <translation>¡Ya existe una cuenta con ese nombre!</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="210"/>
         <source>Advanced Jabber Settings</source>
         <translation>Configuración avanzada de Jabber</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="230"/>
         <source>Server:</source>
         <translation>Servidor:</translation>
     </message>
     <message>
-        <location filename="sip/jabber/configwidget.ui" line="253"/>
         <source>Port:</source>
         <translation>Puerto:</translation>
     </message>
@@ -611,87 +529,70 @@
 <context>
     <name>JabberPlugin</name>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="354"/>
         <source>User Interaction</source>
         <translation>Interacción del usuario</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="357"/>
         <source>Host is unknown</source>
         <translation>El host es desconocido</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="360"/>
         <source>Item not found</source>
         <translation>Objeto no encontrado</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="363"/>
         <source>Authorization Error</source>
         <translation>Error de autorización</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="366"/>
         <source>Remote Stream Error</source>
         <translation>Error de flujo remoto</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="369"/>
         <source>Remote Connection failed</source>
         <translation>Conexión remota fallida</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="372"/>
         <source>Internal Server Error</source>
         <translation>Error interno del servidor</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="375"/>
         <source>System shutdown</source>
         <translation>Apagado del sistema</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="378"/>
         <source>Conflict</source>
         <translation>Conflicto</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="382"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="475"/>
         <source>Add Friend</source>
         <translation>Añadir amigo</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="476"/>
         <source>Enter Jabber ID:</source>
         <translation>Introduzca el ID de Jabber:</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="579"/>
         <source>Add Friend...</source>
         <translation>Añadir amigo...</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="584"/>
         <source>XML Console...</source>
         <translation>Consola XML...</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="631"/>
         <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
         <translation>Lo siento -- Sólo soy una presencia automática usada por el reproductor Tomahawk (http://gettomahawk.com). Si está obteniendo este mensaje, la persona a la que intenta encontrar probablemente esté desconectada, ¡así que inténtelo de nuevo más tarde!</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="728"/>
         <source>Authorize User</source>
         <translation>Autorizar usuario</translation>
     </message>
     <message>
-        <location filename="sip/jabber/jabber.cpp" line="729"/>
         <source>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</source>
         <translation>¿Quiere permitir &lt;b&gt;%1&lt;/b&gt; el acceso a tu colección?</translation>
     </message>
@@ -699,17 +600,14 @@
 <context>
     <name>JobStatusView</name>
     <message>
-        <location filename="PipelineStatusView.cpp" line="44"/>
         <source>Searching For</source>
         <translation>Buscando por</translation>
     </message>
     <message>
-        <location filename="PipelineStatusView.cpp" line="44"/>
         <source>Pending</source>
         <translation>Pendiente</translation>
     </message>
     <message>
-        <location filename="PipelineStatusView.cpp" line="94"/>
         <source>Idle</source>
         <translation>Ocupado</translation>
     </message>
@@ -717,7 +615,6 @@
 <context>
     <name>LastfmContext</name>
     <message>
-        <location filename="libtomahawk/context/pages/WikipediaContext.h" line="62"/>
         <source>Last.fm</source>
         <translation>Last.fm</translation>
     </message>
@@ -725,7 +622,6 @@
 <context>
     <name>LatchedStatusItem</name>
     <message>
-        <location filename="libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
         <source>%1 is listening along to you!</source>
         <translation>¡%1 está escuchando junto a usted!</translation>
     </message>
@@ -733,27 +629,22 @@
 <context>
     <name>LoadXSPF</name>
     <message>
-        <location filename="LoadXSPFDialog.ui" line="14"/>
         <source>Load XSPF</source>
         <translation>Cargar XSPF</translation>
     </message>
     <message>
-        <location filename="LoadXSPFDialog.ui" line="22"/>
         <source>Playlist Url</source>
         <translation>URL de la lista de reproducción</translation>
     </message>
     <message>
-        <location filename="LoadXSPFDialog.ui" line="29"/>
         <source>Enter URL...</source>
         <translation>Introducir URL...</translation>
     </message>
     <message>
-        <location filename="LoadXSPFDialog.ui" line="42"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="LoadXSPFDialog.ui" line="51"/>
         <source>Automatically update</source>
         <translation>Actualizar automáticamente</translation>
     </message>
@@ -761,20 +652,21 @@
 <context>
     <name>LoadXSPFDialog</name>
     <message>
-        <location filename="LoadXSPFDialog.cpp" line="47"/>
         <source>Load XSPF File</source>
         <translation>Cargar archivo XSPF</translation>
     </message>
+    <message>
+        <source>XSPF Files (*.xspf)</source>
+        <translation>Archivos XSPF (*.xspf)</translation>
+    </message>
 </context>
 <context>
     <name>LocalCollection</name>
     <message>
-        <location filename="libtomahawk/database/localcollection.cpp" line="54"/>
         <source>Bookmarks</source>
         <translation>Favoritos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/database/localcollection.cpp" line="54"/>
         <source>Saved tracks</source>
         <translation>Pistas guardadas</translation>
     </message>
@@ -782,50 +674,52 @@
 <context>
     <name>NewPlaylistWidget</name>
     <message>
-        <location filename="libtomahawk/widgets/newplaylistwidget.ui" line="20"/>
         <source>Enter a title for the new playlist:</source>
         <translation>Introduzca un nombre para la nueva lista de reproducción:</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/newplaylistwidget.ui" line="37"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
         <translation>¡Tomahawk le ofrece varias maneras para ayudarle a crear listas de reproducción y encontrar la música que le guste!</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/newplaylistwidget.ui" line="47"/>
         <source>Just enter a genre or tag name and Tomahawk will suggest a few songs to get you started with your new playlist:</source>
         <translation>Introduzca un género o tag y Tomahawk le sugerirá unas cuantas canciones para comenzar su nueva lista de reproducción:</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/newplaylistwidget.cpp" line="43"/>
         <source>&amp;Create Playlist</source>
         <translation>&amp;Crear lista de reproducción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/newplaylistwidget.h" line="49"/>
         <source>Create a new playlist</source>
         <translation>Crear una nueva lista de reproducción</translation>
     </message>
 </context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <source>played %1 by you</source>
+        <translation>%1 reproducido por usted </translation>
+    </message>
+    <message>
+        <source>played %1 by %2</source>
+        <translation>%1 reproducido por %2</translation>
+    </message>
+</context>
 <context>
     <name>PlaylistModel</name>
     <message>
-        <location filename="libtomahawk/playlist/playlistmodel.cpp" line="104"/>
         <source>A playlist by %1, created %2</source>
         <translation>Una lista de reproducción de %1, creada %2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/playlistmodel.cpp" line="105"/>
         <source>you</source>
-        <translation>ti</translation>
+        <translation>usted</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/playlistmodel.cpp" line="224"/>
         <source>All tracks by %1 on album %2</source>
         <translation>Todas las pistas de %1 en el álbum %2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/playlistmodel.cpp" line="244"/>
         <source>All tracks by %1</source>
         <translation>Todas las pistas de %1</translation>
     </message>
@@ -833,37 +727,30 @@
 <context>
     <name>PlaylistTypeSelectorDlg</name>
     <message>
-        <location filename="libtomahawk/widgets/playlisttypeselectordlg.ui" line="32"/>
         <source>New Playlist</source>
         <translation>Nueva lista de reproducción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/playlisttypeselectordlg.ui" line="49"/>
         <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
         <translation>Sólo una lista de reproducción normal... ¡Póngale un nombre, añada algunas pistas, y comience!</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/playlisttypeselectordlg.ui" line="75"/>
         <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
         <translation>¿No sabe exactamente lo que desea? ¡Dele a Tomahawk algunas indicaciones y déjele construir una lista de reproducción para usted!</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/playlisttypeselectordlg.ui" line="92"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/playlisttypeselectordlg.ui" line="102"/>
         <source>New Playlist...</source>
         <translation>Nueva lista de reproducción...</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/playlisttypeselectordlg.ui" line="113"/>
         <source>Create Manual Playlist</source>
         <translation>Crear lista de reproducción manual</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/playlisttypeselectordlg.ui" line="123"/>
         <source>Create Automatic Playlist</source>
         <translation>Crear lista de reproducción automática</translation>
     </message>
@@ -871,70 +758,57 @@
 <context>
     <name>PlaylistView</name>
     <message>
-        <location filename="libtomahawk/playlist/playlistview.cpp" line="142"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
-        <translation>Esta lista de reproducción está vacía. ¡Añádale algunas pistas y disfrute de la música!</translation>
+        <translation>Esta lista de reproducción está vacía. ¡Añada algunas pistas y disfrute de la música!</translation>
     </message>
 </context>
 <context>
     <name>ProxyDialog</name>
     <message>
-        <location filename="proxydialog.ui" line="17"/>
         <source>Proxy Settings</source>
         <translation>Configuración del proxy</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="70"/>
         <source>Hostname of proxy server</source>
         <translation>Hostname del servidor proxy</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="77"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="84"/>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="104"/>
         <source>Proxy login</source>
         <translation>Proxy login</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="111"/>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="118"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="128"/>
         <source>Proxy password</source>
         <translation>Contraseña del proxy</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="135"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="142"/>
         <source>No Proxy Hosts:</source>
         <translation>No hosts proxy:</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="149"/>
         <source>localhost *.example.com (space separated)</source>
         <translation>localhost *.ejemplo.com (separados por espacios)</translation>
     </message>
     <message>
-        <location filename="proxydialog.ui" line="166"/>
         <source>Use proxy for DNS lookups?</source>
         <translation>¿Usar proxy para búsquedas DNS?</translation>
     </message>
@@ -942,75 +816,139 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="221"/>
         <source>ago</source>
-        <translation>atrás</translation>
+        <translation type="obsolete">atrás</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="235"/>
         <source>%1 years%2</source>
-        <translation>%1 años%2</translation>
+        <translation type="obsolete">%1 años%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="237"/>
         <source>%1 year%2</source>
-        <translation>%1 año%2</translation>
+        <translation type="obsolete">%1 año%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="243"/>
         <source>%1 months%2</source>
-        <translation>%1 meses%2</translation>
+        <translation type="obsolete">%1 meses%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="245"/>
         <source>%1 month%2</source>
-        <translation>%1 mes%2</translation>
+        <translation type="obsolete">%1 mes%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="251"/>
         <source>%1 weeks%2</source>
-        <translation>%1 semanas%2</translation>
+        <translation type="obsolete">%1 semanas%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="253"/>
         <source>%1 week%2</source>
-        <translation>%1 semana%2</translation>
+        <translation type="obsolete">%1 semana%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="259"/>
         <source>%1 days%2</source>
-        <translation>%1 días%2</translation>
+        <translation type="obsolete">%1 días%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="261"/>
         <source>%1 day%2</source>
-        <translation>%1 día%2</translation>
+        <translation type="obsolete">%1 día%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="267"/>
         <source>%1 hours%2</source>
-        <translation>%1 horas%2</translation>
+        <translation type="obsolete">%1 horas%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="269"/>
         <source>%1 hour%2</source>
-        <translation>%1 hora%2</translation>
+        <translation type="obsolete">%1 hora%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="275"/>
         <source>%1 minutes%2</source>
-        <translation>%1 minutos%2</translation>
+        <translation type="obsolete">%1 minutos%2</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/tomahawkutils.cpp" line="279"/>
         <source>just now</source>
         <translation>justo ahora</translation>
     </message>
+    <message numerus="yes">
+        <source>%n year(s) ago</source>
+        <translation>
+            <numerusform>hace %n año</numerusform>
+            <numerusform>hace%n años</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation>
+            <numerusform>%n año</numerusform>
+            <numerusform>%n años</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s) ago</source>
+        <translation>
+            <numerusform>hace %n mes</numerusform>
+            <numerusform>hace %n meses</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation>
+            <numerusform>%n mes</numerusform>
+            <numerusform>%n meses</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s) ago</source>
+        <translation>
+            <numerusform>hace %n semana</numerusform>
+            <numerusform>hace %n semanas</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation>
+            <numerusform>%n semana</numerusform>
+            <numerusform>%n semanas</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s) ago</source>
+        <translation>
+            <numerusform>hace %n día</numerusform>
+            <numerusform>hace %n días</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation>
+            <numerusform>%n día</numerusform>
+            <numerusform>%n días</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s) ago</source>
+        <translation>
+            <numerusform>hace %n hora</numerusform>
+            <numerusform>hace %n horas</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation>
+            <numerusform>%n hora</numerusform>
+            <numerusform>%n horas</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>%1 minutes ago</source>
+        <translation>hace %1 minutos</translation>
+    </message>
+    <message>
+        <source>%1 minutes</source>
+        <translation>%1 minutos</translation>
+    </message>
 </context>
 <context>
     <name>QuaZipFilePrivate</name>
     <message>
-        <location filename="libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
         <source>ZIP/UNZIP API error %1</source>
         <translation>ZIP/UNZIP API error %1</translation>
     </message>
@@ -1018,22 +956,18 @@
 <context>
     <name>QueueView</name>
     <message>
-        <location filename="libtomahawk/playlist/queueview.ui" line="26"/>
         <source>InfoBar</source>
         <translation>InfoBar</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/queueview.ui" line="41"/>
         <source>Open Queue</source>
         <translation>Abrir cola</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/queueview.cpp" line="101"/>
         <source>Show Queue</source>
         <translation>Mostrar cola</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/queueview.cpp" line="111"/>
         <source>Hide Queue</source>
         <translation>Ocultar cola</translation>
     </message>
@@ -1041,7 +975,6 @@
 <context>
     <name>RelatedArtistsContext</name>
     <message>
-        <location filename="libtomahawk/context/pages/RelatedArtistsContext.h" line="45"/>
         <source>Related Artists</source>
         <translation>Artistas relacionados</translation>
     </message>
@@ -1049,12 +982,10 @@
 <context>
     <name>ResolverConfigDelegate</name>
     <message>
-        <location filename="resolverconfigdelegate.cpp" line="110"/>
         <source>Not found: %1</source>
         <translation>No encontrado: %1</translation>
     </message>
     <message>
-        <location filename="resolverconfigdelegate.cpp" line="113"/>
         <source>Failed to load: %1</source>
         <translation>Fallo al cargar: %1</translation>
     </message>
@@ -1062,7 +993,6 @@
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="libtomahawk/playlist/topbar/searchlineedit.cpp" line="58"/>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
@@ -1070,12 +1000,10 @@
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="libtomahawk/widgets/searchwidget.h" line="51"/>
         <source>Search: %1</source>
         <translation>Buscar: %1</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/searchwidget.h" line="52"/>
         <source>Results for &apos;%1&apos;</source>
         <translation>Resultados para &apos;%1&apos;</translation>
     </message>
@@ -1083,19 +1011,17 @@
 <context>
     <name>Servent</name>
     <message>
-        <location filename="libtomahawk/network/servent.cpp" line="714"/>
         <source>Incoming Connection Attempt</source>
-        <translation>Intento de conexión entrante</translation>
+        <translation type="obsolete">Intento de conexión entrante</translation>
     </message>
     <message>
-        <location filename="libtomahawk/network/servent.cpp" line="715"/>
         <source>Another Tomahawk instance is attempting to connect to you. Select whether to allow or deny this connection.
 
 Peer name: %1
 Peer ID: %2
 
 Remember: Only allow peers to connect if you have the legal right for them to stream music from you.</source>
-        <translation>Otra instancia de Tomahawk está intentando conectarse a usted. Seleccione si autorizar o denegar ésta conexión.
+        <translation type="obsolete">Otra instancia de Tomahawk está intentando conectarse a usted. Seleccione si autorizar o denegar ésta conexión.
 
 Nombre del peer: %1
 Peer ID: %2
@@ -1103,94 +1029,84 @@ Peer ID: %2
 Recuerde: Sólo acéptelo si tiene el derecho legal para que escuchen música de usted.</translation>
     </message>
     <message>
-        <location filename="libtomahawk/network/servent.cpp" line="716"/>
         <source>Deny</source>
-        <translation>Denegar</translation>
+        <translation type="obsolete">Denegar</translation>
     </message>
     <message>
-        <location filename="libtomahawk/network/servent.cpp" line="717"/>
         <source>Always Deny</source>
-        <translation>Denegar siempre</translation>
+        <translation type="obsolete">Denegar siempre</translation>
     </message>
     <message>
-        <location filename="libtomahawk/network/servent.cpp" line="718"/>
         <source>Allow</source>
-        <translation>Permitir</translation>
+        <translation type="obsolete">Permitir</translation>
     </message>
     <message>
-        <location filename="libtomahawk/network/servent.cpp" line="719"/>
         <source>Always Allow</source>
-        <translation>Permitir siempre</translation>
+        <translation type="obsolete">Permitir siempre</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="265"/>
         <source>Accounts</source>
         <translation>Cuentas</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="272"/>
         <source>Collection</source>
         <translation>Colección</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="279"/>
         <source>Last.fm</source>
         <translation>Last.fm</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="286"/>
         <source>Resolvers</source>
         <translation>Resolvedores</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="293"/>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="445"/>
-        <location filename="settingsdialog.cpp" line="460"/>
         <source>Failed</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="450"/>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="466"/>
         <source>Could not contact server</source>
         <translation>No se puede contactar con el servidor</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="477"/>
         <source>Load script resolver file</source>
         <translation>Cargar script de resolvedor</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="764"/>
         <source>Delete Account</source>
         <translation>Borrar cuenta</translation>
     </message>
+    <message>
+        <source>Information</source>
+        <translation>Información</translation>
+    </message>
+    <message>
+        <source>Changing this setting requires a restart of Tomahawk!</source>
+        <translation>¡Cambiar esta configuración requiere el reinicio de Tomahawk!</translation>
+    </message>
 </context>
 <context>
     <name>SipConfigDelegate</name>
     <message>
-        <location filename="sipconfigdelegate.cpp" line="183"/>
         <source>Online</source>
-        <translation>En línea</translation>
+        <translation>Conectado</translation>
     </message>
     <message>
-        <location filename="sipconfigdelegate.cpp" line="186"/>
         <source>Connecting...</source>
         <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="sipconfigdelegate.cpp" line="189"/>
         <source>Offline</source>
         <translation>Desconectado</translation>
     </message>
@@ -1198,34 +1114,37 @@ Recuerde: Sólo acéptelo si tiene el derecho legal para que escuchen música de
 <context>
     <name>SipHandler</name>
     <message>
-        <location filename="libtomahawk/sip/SipHandler.cpp" line="385"/>
         <source>Legal Warning</source>
         <translation>Advertencia legal</translation>
     </message>
     <message>
-        <location filename="libtomahawk/sip/SipHandler.cpp" line="386"/>
         <source>By pressing OK below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemnify the Tomahawk developers and project from liability should you choose to break those laws.
 
 For more information, please see http://gettomahawk.com/legal</source>
-        <translation>Si acepta este diálogo, está de acuerdo con que su uso de Tomahawk irá en concordancia con cualquier ley aplicable, incluyendo copyright y leyes de propiedad intelectual efectivas en su país de residencia, y acepta indemnizar a los desarrolladores de Tomahawk en el caso que rompa las leyes.
+        <translation type="obsolete">Si acepta este diálogo, está de acuerdo con que su uso de Tomahawk irá en concordancia con cualquier ley aplicable, incluyendo copyright y leyes de propiedad intelectual efectivas en su país de residencia, y acepta indemnizar a los desarrolladores de Tomahawk en el caso que rompa las leyes.
 
 Para más información, por favor visite http://gettomahawk.com/legal</translation>
     </message>
     <message>
-        <location filename="libtomahawk/sip/SipHandler.cpp" line="387"/>
         <source>I Do Not Agree</source>
         <translation>Rechazar</translation>
     </message>
     <message>
-        <location filename="libtomahawk/sip/SipHandler.cpp" line="387"/>
         <source>I Agree</source>
         <translation>Aceptar</translation>
     </message>
+    <message>
+        <source>By pressing I Agree below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemnify the Tomahawk developers and project from liability should you choose to break those laws.
+
+For more information, please see http://gettomahawk.com/legal</source>
+        <translation>Si acepta este diálogo, estará de acuerdo con que su uso de Tomahawk irá en concordancia con cualquier ley aplicable, incluyendo copyright y leyes de propiedad intelectual efectivas en su país de residencia, y acepta indemnizar a los desarrolladores de Tomahawk y al proyectoen el caso que rompa las leyes.
+
+Para más información, por favor visite http://gettomahawk.com/legal</translation>
+    </message>
 </context>
 <context>
     <name>SipModel</name>
     <message>
-        <location filename="libtomahawk/sip/SipModel.cpp" line="58"/>
         <source>Add New Account...</source>
         <translation>Añadir nueva cuenta...</translation>
     </message>
@@ -1233,93 +1152,77 @@ Para más información, por favor visite http://gettomahawk.com/legal</translati
 <context>
     <name>SocialPlaylistWidget</name>
     <message>
-        <location filename="libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
         <source>Popular New Albums From Your Friends</source>
         <translation>Nuevos álbumes favoritos de tus amigos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
         <source>Most Played Playlists</source>
         <translation>Listas de reproducción más reproducidas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
         <source>Most Played Tracks You Don&apos;t Have</source>
-        <translation>Pistas más reproducidas que no tiene</translation>
+        <translatorcomment>Que no tiene/No son suyas</translatorcomment>
+        <translation>Pistas más reproducidas no disponibles</translation>
     </message>
 </context>
 <context>
     <name>SourceDelegate</name>
     <message>
-        <location filename="sourcetree/sourcedelegate.cpp" line="53"/>
         <source>Track</source>
         <translation>Pista</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcedelegate.cpp" line="54"/>
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcedelegate.cpp" line="55"/>
         <source>Artist</source>
         <translation>Artista</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcedelegate.cpp" line="56"/>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcedelegate.cpp" line="57"/>
         <source>Top 10</source>
         <translation>Top 10</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcedelegate.cpp" line="197"/>
         <source>Offline</source>
         <translation>Desconectado</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcedelegate.cpp" line="199"/>
         <source>All available tracks</source>
         <translation>Todas las pistas disponibles</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcedelegate.cpp" line="206"/>
         <source>Online</source>
-        <translation>En línea</translation>
+        <translation>Conectado</translation>
     </message>
 </context>
 <context>
     <name>SourceInfoWidget</name>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="19"/>
         <source>Recent Albums</source>
         <translation>Álbumes recientes</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="63"/>
         <source>Latest Additions</source>
         <translation>Añadido recientemente</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="77"/>
         <source>Recently Played Tracks</source>
         <translation>Pistas reproducidas recientemente</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="73"/>
         <source>New Additions</source>
         <translation>Nuevas adiciones</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="76"/>
         <source>My recent activity</source>
         <translation>Mi actividad reciente</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="80"/>
         <source>Recent activity from %1</source>
         <translation>Actividad reciente de %1</translation>
     </message>
@@ -1327,27 +1230,22 @@ Para más información, por favor visite http://gettomahawk.com/legal</translati
 <context>
     <name>SourceTreeView</name>
     <message>
-        <location filename="sourcetree/sourcetreeview.cpp" line="175"/>
         <source>&amp;Copy Link</source>
         <translation>&amp;Copiar enlace</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcetreeview.cpp" line="176"/>
         <source>&amp;Delete %1</source>
         <translation>&amp;Eliminar %1</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcetreeview.cpp" line="194"/>
         <source>&amp;Export Playlist</source>
         <translation>&amp;Exportar lista de reproducción</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcetreeview.cpp" line="306"/>
         <source>Save XSPF</source>
         <translation>Guardar XSPF</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcetreeview.cpp" line="307"/>
         <source>Playlists (*.xspf)</source>
         <translation>Listas de reproducción (*.xspf)</translation>
     </message>
@@ -1355,22 +1253,18 @@ Para más información, por favor visite http://gettomahawk.com/legal</translati
 <context>
     <name>SourcesModel</name>
     <message>
-        <location filename="sourcetree/sourcesmodel.cpp" line="73"/>
         <source>Collection</source>
         <translation>Colección</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcesmodel.cpp" line="76"/>
         <source>Playlist</source>
         <translation>Lista de reproducción</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcesmodel.cpp" line="79"/>
         <source>Automatic Playlist</source>
         <translation>Lista de reproducción automática</translation>
     </message>
     <message>
-        <location filename="sourcetree/sourcesmodel.cpp" line="82"/>
         <source>Station</source>
         <translation>Estación</translation>
     </message>
@@ -1378,181 +1272,147 @@ Para más información, por favor visite http://gettomahawk.com/legal</translati
 <context>
     <name>StackedSettingsDialog</name>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
         <translation>Preferencias de Tomahawk</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="98"/>
         <source>Accounts</source>
         <translation>Cuentas</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="107"/>
         <source>Connect to your friends with Google Chat, Twitter, and more.</source>
-        <translation>Conecta con tus amigos de Google Chat, Twitter y más.</translation>
+        <translation>Conecta con tus amigos con Google Chat, Twitter y más.</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="140"/>
-        <location filename="stackedsettingsdialog.ui" line="154"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="195"/>
         <source>Local Music Information</source>
         <translation>Información de música local</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="203"/>
         <source>Path to scan for music files:</source>
         <translation>Ruta para escanear archivos de música:</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="217"/>
         <source>The Echo Nest supports keeping track of your catalog metadata
  and using it to craft personalized radios. Enabling this option
  will allow you (and all your friends) to create automatic playlists
  and stations based on your personal taste profile.</source>
-        <translation>Echo Nest analiza los metadatos de tu colección
+        <translation>The Echo Nest analiza los metadatos de su colección
 y los emplea para crear radios personalizadas. Activando esta opción
-te permitirá a ti (y a tus amigos) crear listas de reproducción automáticas
-y estaciones basadas en tus gustos personales.</translation>
+usted podrá (y sus amigos) crear listas de reproducción automáticas
+y estaciones basadas en sus gustos personales.</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="223"/>
         <source>Upload collection list to The Echo Nest to enable user radio</source>
         <translation>Subir la lista de colección a Echo Nest para activar la radio del usuario</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="236"/>
         <source>Watch for changes</source>
         <translation>Vigilar los cambios en las carpetas</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="245"/>
         <source>Time between scans, in seconds:</source>
         <translation>Tiempo entre escaneo, en segundos:</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="276"/>
         <source>Now Playing Information</source>
         <translation>Información de pista en reproducción</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="282"/>
         <source>Applications to update with currently playing track:</source>
         <translation>Servicios a actualizar con la pista actualmente en reproducción:</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="293"/>
         <source>Adium</source>
         <translation>Adium</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="320"/>
         <source>Scrobble tracks to Last.fm</source>
         <translation>Enviar pistas a Last.fm</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="329"/>
         <source>Username:</source>
         <translation>Nombre de usuario:</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="339"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="355"/>
         <source>Test Login</source>
         <translation>Probar el inicio de sesión</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="389"/>
         <source>Script Resolvers</source>
         <translation>Scripts de resolvedores</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="398"/>
         <source>Script resolvers search for a given track to make it playable.</source>
         <translation>Los scripts de los resolvedores buscan y hacen reproducibles las pistas en línea.</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="405"/>
         <source>Get more resolvers...</source>
         <translation>Conseguir más resolvedores...</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="496"/>
         <source>Advanced Network Settings</source>
         <translation>Configuración avanzada de red</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="516"/>
         <source>If you&apos;re having difficulty connecting to peers, try setting this to your external IP address/host name and a port number (default 50210). Make sure to forward that port to this machine!</source>
         <translation>Si tiene dificultades para conectarse con los pares, intente establecer su dirección IP externa/nombre del host y el número de puerto (por defecto 50210). ¡Asegúrese de redireccionar ese puerto a esta máquina!</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="534"/>
         <source>Static Host Name:</source>
         <translation>Nombre estático del host:</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="550"/>
         <source>Static Port:</source>
         <translation>Puerto estático:</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="572"/>
         <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
         <translation>¿Siempre usar nombre eśtático del host/puerto? (Sobreescribe descubrimiento UPnP/redirección de puertos)</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="596"/>
         <source>Proxy Settings...</source>
         <translation>Configuración del proxy...</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="634"/>
         <source>Playdar HTTP API</source>
         <translation>API HTTP de Playdar</translation>
     </message>
     <message>
-        <location filename="stackedsettingsdialog.ui" line="647"/>
         <source>Use UPnP to establish port forward</source>
         <translation>Utilizar UPnP para establecer redirección de puertos</translation>
     </message>
+    <message>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation>Mandar reportes después de que Tomahawk falle</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::ContextMenu</name>
     <message>
-        <location filename="libtomahawk/contextmenu.cpp" line="75"/>
-        <location filename="libtomahawk/contextmenu.cpp" line="122"/>
-        <location filename="libtomahawk/contextmenu.cpp" line="161"/>
         <source>&amp;Play</source>
         <translation>&amp;Reproducir</translation>
     </message>
     <message>
-        <location filename="libtomahawk/contextmenu.cpp" line="78"/>
-        <location filename="libtomahawk/contextmenu.cpp" line="125"/>
-        <location filename="libtomahawk/contextmenu.cpp" line="164"/>
         <source>Add to &amp;Queue</source>
         <translation>Añadir a la &amp;cola</translation>
     </message>
     <message>
-        <location filename="libtomahawk/contextmenu.cpp" line="83"/>
         <source>Copy Track &amp;Link</source>
         <translation>Copiar enlace de &amp;pista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/contextmenu.cpp" line="88"/>
         <source>&amp;Delete Items</source>
         <translation>&amp;Eliminar de la cola</translation>
     </message>
     <message>
-        <location filename="libtomahawk/contextmenu.cpp" line="88"/>
         <source>&amp;Delete Item</source>
         <translation>&amp;Eliminar de la cola</translation>
     </message>
@@ -1560,32 +1420,26 @@ y estaciones basadas en tus gustos personales.</translation>
 <context>
     <name>Tomahawk::CustomPlaylistView</name>
     <message>
-        <location filename="libtomahawk/playlist/customplaylistview.cpp" line="116"/>
         <source>Top Loved Tracks</source>
         <translation>Pistas favoritas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/customplaylistview.cpp" line="120"/>
         <source>Your loved tracks</source>
         <translation>Tus pistas favoritas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/customplaylistview.cpp" line="122"/>
         <source>%1&apos;s loved tracks</source>
         <translation>Pistas favoritas de %1</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/customplaylistview.cpp" line="131"/>
         <source>The most loved tracks from all your friends</source>
         <translation>Las pistas favoritas de tus amigos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/customplaylistview.cpp" line="135"/>
         <source>All of your loved tracks</source>
         <translation>Todas tus pistas favoritas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/customplaylistview.cpp" line="137"/>
         <source>All of %1&apos;s loved tracks</source>
         <translation>Todas las pistas favoritas de %1</translation>
     </message>
@@ -1593,12 +1447,10 @@ y estaciones basadas en tus gustos personales.</translation>
 <context>
     <name>Tomahawk::DropJobNotifier</name>
     <message>
-        <location filename="libtomahawk/utils/dropjobnotifier.cpp" line="100"/>
         <source>Fetching %1 from database</source>
-        <translation>Obteniendo %1 de base de datos</translation>
+        <translation>Obteniendo %1 de la base de datos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/dropjobnotifier.cpp" line="104"/>
         <source>Parsing %1 %2</source>
         <translation>Analizando %1 %2</translation>
     </message>
@@ -1606,7 +1458,6 @@ y estaciones basadas en tus gustos personales.</translation>
 <context>
     <name>Tomahawk::DynamicControlList</name>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="82"/>
         <source>Click to collapse</source>
         <translation>Click para contraer</translation>
     </message>
@@ -1614,8 +1465,6 @@ y estaciones basadas en tus gustos personales.</translation>
 <context>
     <name>Tomahawk::DynamicModel</name>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/DynamicModel.cpp" line="167"/>
-        <location filename="libtomahawk/playlist/dynamic/DynamicModel.cpp" line="281"/>
         <source>Could not find a playable track.
 
 Please change the filters or try again.</source>
@@ -1624,7 +1473,6 @@ Please change the filters or try again.</source>
 Por favor, cambie los filtros o inténtelo de nuevo.</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/DynamicModel.cpp" line="218"/>
         <source>Failed to generate preview with the desired filters</source>
         <translation>Fallo al generar vista previa con los filtros deseados</translation>
     </message>
@@ -1632,12 +1480,10 @@ Por favor, cambie los filtros o inténtelo de nuevo.</translation>
 <context>
     <name>Tomahawk::DynamicSetupWidget</name>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="52"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="66"/>
         <source>Generate</source>
         <translation>Generar</translation>
     </message>
@@ -1645,17 +1491,14 @@ Por favor, cambie los filtros o inténtelo de nuevo.</translation>
 <context>
     <name>Tomahawk::DynamicView</name>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/DynamicView.cpp" line="143"/>
         <source>Add some filters above to seed this station!</source>
         <translation>¡Añada algunos filtros para la estación!</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/DynamicView.cpp" line="148"/>
         <source>Press Generate to get started!</source>
         <translation>¡Seleccione Generar para comenzar!</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/DynamicView.cpp" line="150"/>
         <source>Add some filters above, and press Generate to get started!</source>
         <translation>¡Añada algunos filtros, y seleccione Generar para comenzar!</translation>
     </message>
@@ -1663,323 +1506,312 @@ Por favor, cambie los filtros o inténtelo de nuevo.</translation>
 <context>
     <name>Tomahawk::EchonestControl</name>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="187"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="252"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="272"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="336"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="355"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="420"/>
         <source>is</source>
         <translation>es</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="205"/>
         <source>from user</source>
         <translation>del usuario</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="214"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="579"/>
         <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
-        <translation>No hay usuario con los catálogos Echo Nest activados. Pruebe a activar la opción en la configuración de la colección</translation>
+        <translation>No hay usuarios con los catálogos Echo Nest activados. Pruebe a activar la opción en la configuración de la colección</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="233"/>
         <source>similar to</source>
         <translation>similar a</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="253"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="273"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="310"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="314"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="318"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="322"/>
         <source>Less</source>
         <translation>Menos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="253"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="273"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="310"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="314"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="318"/>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="322"/>
         <source>More</source>
         <translation>Más</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="293"/>
         <source>0 BPM</source>
         <translation>0 BPM</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="293"/>
         <source>500 BPM</source>
         <translation>500 BPM</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="297"/>
         <source>0 secs</source>
         <translation>0 segundos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="297"/>
         <source>3600 secs</source>
         <translation>3600 segundos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="301"/>
         <source>-100 dB</source>
         <translation>-100 dB</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="301"/>
         <source>100 dB</source>
         <translation>100 db</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="338"/>
         <source>Major</source>
         <translation>Mayor</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="339"/>
         <source>Minor</source>
         <translation>Menor</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="357"/>
         <source>C</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="358"/>
         <source>C Sharp</source>
         <translation>Do sostenido</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="359"/>
         <source>D</source>
         <translation>Re</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
         <source>E Flat</source>
         <translation>Mi bemol</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="361"/>
         <source>E</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
         <source>F</source>
         <translation>Fa</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
         <source>F Sharp</source>
         <translation>Fa sostenido</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
         <source>G</source>
         <translation>Sol</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
         <source>A Flat</source>
         <translation>La bemol</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
         <source>A</source>
         <translation>La</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
         <source>B Flat</source>
         <translation>Si bemol</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
         <source>B</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="385"/>
         <source>Ascending</source>
         <translation>Ascendente</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="386"/>
         <source>Descending</source>
         <translation>Descendent</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="389"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
         <source>Loudness</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="392"/>
         <source>Artist Familiarity</source>
         <translation>Familiaridad del artista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="393"/>
         <source>Artist Hotttnesss</source>
         <translation>Popularidad del artista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
         <source>Song Hotttnesss</source>
         <translation>Popularidad de la pista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
         <source>Latitude</source>
         <translation>Latitud</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
         <source>Longitude</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
         <source>Mode</source>
         <translation>Modo</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
         <source>Key</source>
         <translation>Tonalidad</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
         <source>Energy</source>
         <translation>Energía</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
         <source>Danceability</source>
         <translation>Bailabilidad</translation>
     </message>
+    <message>
+        <source>only by ~%1</source>
+        <translation>sólo por ~%1</translation>
+    </message>
+    <message>
+        <source>similar to ~%1</source>
+        <translation>similar a ~%1</translation>
+    </message>
+    <message>
+        <source>with genre ~%1</source>
+        <translation>con el género ~%1</translation>
+    </message>
+    <message>
+        <source>from no one</source>
+        <translation>de ninguno</translation>
+    </message>
+    <message>
+        <source>My Collection</source>
+        <translation>Mi colección</translation>
+    </message>
+    <message>
+        <source>from %1 radio</source>
+        <translation>de %1 radio</translation>
+    </message>
+    <message>
+        <source>with %1 %2</source>
+        <translation>con %1 %2</translation>
+    </message>
+    <message>
+        <source>about %1 BPM</source>
+        <translation>sobre %1 BPM</translation>
+    </message>
+    <message numerus="yes">
+        <source>about %n minute(s) long</source>
+        <translation>
+            <numerusform>sobre %n minuto de duración</numerusform>
+            <numerusform>sobre %n minutos de duración</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>about %1 dB</source>
+        <translation>sobre %1 dB</translation>
+    </message>
+    <message>
+        <source>at around %1%2 %3</source>
+        <translation>sobre %1%2 %3</translation>
+    </message>
+    <message>
+        <source>in %1</source>
+        <translation>en %1</translation>
+    </message>
+    <message>
+        <source>in a %1 key</source>
+        <translation>en la tonalidad %1</translation>
+    </message>
+    <message>
+        <source>sorted in %1 %2 order</source>
+        <translation>ordenado en %1 %2</translation>
+    </message>
+    <message>
+        <source>with a %1 mood</source>
+        <translation>con un carácter %1</translation>
+    </message>
+    <message>
+        <source>in a %1 style</source>
+        <translation>con un estilo %1</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::EchonestSteerer</name>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="57"/>
         <source>Steer this station:</source>
         <translation>Dirigir esta estación:</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="63"/>
         <source>Takes effect on track change</source>
-        <translation>Surge efecto al cambiar de pista</translation>
+        <translation type="obsolete">Surge efecto al cambiar de pista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="71"/>
         <source>Much less</source>
         <translation>Mucho menos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="72"/>
         <source>Less</source>
         <translation>Menos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="73"/>
         <source>A bit less</source>
         <translation>Un poco menos</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="74"/>
         <source>Keep at current</source>
         <translation>Mantener en el actual</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="75"/>
         <source>A bit more</source>
         <translation>Un poco más</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="76"/>
         <source>More</source>
         <translation>Más</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="77"/>
         <source>Much more</source>
         <translation>Mucho más</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="80"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
         <source>Loudness</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
         <source>Danceability</source>
         <translation>Bailabilidad</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
         <source>Energy</source>
         <translation>Energía</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
         <source>Song Hotttnesss</source>
         <translation>Popularidad de la pista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
         <source>Artist Hotttnesss</source>
         <translation>Popularidad del artista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
         <source>Artist Familiarity</source>
         <translation>Familiaridad del artista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
         <source>By Description</source>
         <translation>Por descripción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
         <source>Enter a description</source>
         <translation>Introducir una descripción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="102"/>
         <source>Apply steering command</source>
         <translation>Aplicar comando</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="108"/>
         <source>Reset all steering commands</source>
         <translation>Resetear todos los comandos</translation>
     </message>
@@ -1987,50 +1819,64 @@ Por favor, cambie los filtros o inténtelo de nuevo.</translation>
 <context>
     <name>Tomahawk::InfoSystem::ChartsPlugin</name>
     <message>
-        <location filename="libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="303"/>
         <source>Top Overall</source>
         <translation>Top total</translation>
     </message>
     <message>
-        <location filename="libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="389"/>
         <source>Artists</source>
         <translation>Artistas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="391"/>
         <source>Albums</source>
         <translation>Álbumes</translation>
     </message>
     <message>
-        <location filename="libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="393"/>
         <source>Tracks</source>
         <translation>Pistas</translation>
     </message>
 </context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmPlugin</name>
+    <message>
+        <source>Top Tracks</source>
+        <translation>Pistas más escuchadas</translation>
+    </message>
+    <message>
+        <source>Loved Tracks</source>
+        <translation>Pistas favoritas</translation>
+    </message>
+    <message>
+        <source>Hyped Tracks</source>
+        <translation>Pistas en alza</translation>
+    </message>
+    <message>
+        <source>Top Artists</source>
+        <translation>Artistas más escuchados</translation>
+    </message>
+    <message>
+        <source>Hyped Artists</source>
+        <translation>Artistas en alza</translation>
+    </message>
+</context>
 <context>
     <name>Tomahawk::JSPFLoader</name>
     <message>
-        <location filename="libtomahawk/utils/jspfloader.cpp" line="137"/>
         <source>New Playlist</source>
         <translation>Nueva lista de reproducción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/jspfloader.cpp" line="163"/>
         <source>Failed to save tracks</source>
         <translation>Fallo al guardar pistas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/jspfloader.cpp" line="163"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
-        <translation>Algunas pistas en la lista de reproducción no contienen artista ni título. Serán ignoradas.</translation>
+        <translation>Algunas pistas en la lista de reproducción no contienen artista ni título. Éstas serán ignoradas.</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/jspfloader.cpp" line="182"/>
         <source>XSPF Error</source>
         <translation>Error XSPF</translation>
     </message>
     <message>
-        <location filename="libtomahawk/utils/jspfloader.cpp" line="182"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Esta no es una lista de reproducción XSPF válida.</translation>
     </message>
@@ -2038,13 +1884,10 @@ Por favor, cambie los filtros o inténtelo de nuevo.</translation>
 <context>
     <name>Tomahawk::LatchManager</name>
     <message>
-        <location filename="libtomahawk/LatchManager.cpp" line="85"/>
         <source>&amp;Catch Up</source>
         <translation>&amp;Actualizar</translation>
     </message>
     <message>
-        <location filename="libtomahawk/LatchManager.cpp" line="120"/>
-        <location filename="libtomahawk/LatchManager.cpp" line="138"/>
         <source>&amp;Listen Along</source>
         <translation>&amp;Escuchar juntos</translation>
     </message>
@@ -2052,72 +1895,65 @@ Por favor, cambie los filtros o inténtelo de nuevo.</translation>
 <context>
     <name>Tomahawk::Source</name>
     <message>
-        <location filename="libtomahawk/source.cpp" line="222"/>
-        <location filename="libtomahawk/source.cpp" line="269"/>
         <source>Scanning (%L1 tracks)</source>
         <translation>Escaneando (%L1 pistas)</translation>
     </message>
     <message>
-        <location filename="libtomahawk/source.cpp" line="254"/>
         <source>Checking</source>
-        <translation>Chequeando</translation>
+        <translation>Comprobando</translation>
     </message>
     <message>
-        <location filename="libtomahawk/source.cpp" line="259"/>
         <source>Fetching</source>
         <translation>Obteniendo</translation>
     </message>
     <message>
-        <location filename="libtomahawk/source.cpp" line="264"/>
         <source>Parsing</source>
         <translation>Analizando</translation>
     </message>
     <message>
-        <location filename="libtomahawk/source.cpp" line="380"/>
         <source>Saving (%1%)</source>
         <translation>Guardando (%1%)</translation>
     </message>
 </context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <source>My Collection</source>
+        <translation>Mi colección</translation>
+    </message>
+</context>
 <context>
     <name>TomahawkOAuthTwitter</name>
     <message>
-        <location filename="sip/twitter/tomahawkoauthtwitter.cpp" line="19"/>
         <source>Twitter PIN</source>
         <translation>PIN de Twitter</translation>
     </message>
     <message>
-        <location filename="sip/twitter/tomahawkoauthtwitter.cpp" line="19"/>
         <source>After authenticating on Twitter&apos;s web site,
 enter the displayed PIN number here:</source>
         <translation>Después de autenticarse en el sitio web de Twitter,
-introduzca el número PIN aquí:</translation>
+introduzca su número PIN aquí:</translation>
     </message>
 </context>
 <context>
     <name>TomahawkTrayIcon</name>
     <message>
-        <location filename="tomahawktrayicon.cpp" line="58"/>
-        <location filename="tomahawktrayicon.cpp" line="90"/>
         <source>Hide Tomahawk Window</source>
         <translation>Ocultar ventana de Tomahawk</translation>
     </message>
     <message>
-        <location filename="tomahawktrayicon.cpp" line="95"/>
         <source>Show Tomahawk Window</source>
         <translation>Mostrar ventana de Tomahawk</translation>
     </message>
     <message>
-        <location filename="tomahawktrayicon.cpp" line="145"/>
         <source>Currently not playing.</source>
-        <translation>No reproduciendo actualmente.</translation>
+        <translation>Ninguna pista en reproducción.</translation>
     </message>
     <message>
-        <location filename="tomahawktrayicon.cpp" line="200"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="tomahawktrayicon.cpp" line="207"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
@@ -2125,336 +1961,279 @@ introduzca el número PIN aquí:</translation>
 <context>
     <name>TomahawkWindow</name>
     <message>
-        <location filename="tomahawkwindow.ui" line="14"/>
         <source>Tomahawk</source>
         <translation>Tomahawk</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="75"/>
         <source>&amp;Settings</source>
         <translation>&amp;Configuración</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="81"/>
         <source>&amp;Tomahawk</source>
         <translation>&amp;Tomahawk</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="100"/>
         <source>&amp;Network</source>
         <translation>&amp;Red</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="107"/>
         <source>&amp;Window</source>
         <translation>&amp;Ventana</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="114"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="128"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="131"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="139"/>
         <source>Go &amp;Online</source>
         <translation>&amp;Conectarse</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="144"/>
         <source>Add &amp;Friend...</source>
         <translation>Añadir &amp;amigo...</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="149"/>
         <source>U&amp;pdate Collection</source>
         <translation>A&amp;ctualizar colección</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="152"/>
         <source>Update Collection</source>
         <translation>Actualizar colección</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="157"/>
         <source>&amp;Configure Tomahawk...</source>
         <translation>&amp;Configurar Tomahawk...</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="165"/>
         <source>Load &amp;XSPF...</source>
         <translation>Cargar &amp;XSPF...</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="170"/>
         <source>Create &amp;New Playlist...</source>
         <translation>Crear una &amp;nueva lista de reproducción...</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="175"/>
         <source>About &amp;Tomahawk...</source>
         <translation>Acerca de &amp;Tomahawk...</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="183"/>
         <source>Create New &amp;Automatic Playlist</source>
         <translation>Crear nueva &amp;lista de reproducción automática</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="188"/>
         <source>Create New &amp;Station</source>
         <translation>Crear nueva &amp;estación</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="196"/>
         <source>Show Offline Sources</source>
         <translation>Mostrar fuentes fuera de línea</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="201"/>
         <source>Hide Offline Sources</source>
         <translation>Ocultar fuentes fuera de línea</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="206"/>
         <source>Minimize</source>
         <translation>Minimizar</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="209"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="214"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="217"/>
         <source>Meta+Ctrl+Z</source>
         <translation>Meta+Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="222"/>
         <source>Diagnostics...</source>
         <translation>Diagnósticos...</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="230"/>
         <source>Fully &amp;Rescan Collection</source>
         <translation>&amp;Re-escanear completamente la colección</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="233"/>
         <source>Fully Rescan Collection</source>
         <translation>Re-escanear completamente la colección</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="238"/>
-        <location filename="tomahawkwindow.cpp" line="647"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="241"/>
         <source>Space</source>
         <translation>Espacio</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="246"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.ui" line="251"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="216"/>
         <source>Global Search...</source>
         <translation>Búsqueda global...</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="267"/>
-        <location filename="tomahawkwindow.cpp" line="284"/>
         <source>Check For Updates...</source>
         <translation>Buscar actualizaciones...</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="444"/>
-        <location filename="tomahawkwindow.cpp" line="451"/>
-        <location filename="tomahawkwindow.cpp" line="459"/>
         <source>Connect To Peer</source>
         <translation>Conectar a un par</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="445"/>
         <source>Enter peer address:</source>
         <translation>Introducir dirección del par:</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="452"/>
         <source>Enter peer port:</source>
         <translation>Introducir puerto del par:</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="460"/>
         <source>Enter peer key:</source>
         <translation>Introducir contraseña del par:</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="553"/>
         <source>XSPF Error</source>
         <translation>Error XSPF</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="553"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Esta no es una lista de reproducción XSPF válida.</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="557"/>
         <source>Failed to save tracks</source>
         <translation>Fallo al guardar pistas</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="557"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Algunas pistas en la lista de reproducción no contienen artista ni título. Serán ignoradas.</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="589"/>
         <source>Create New Station</source>
         <translation>Crear nueva estación</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="589"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="589"/>
         <source>New Station</source>
-        <translation>Nueva emisora</translation>
+        <translation>Nueva estación</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="623"/>
         <source>New Playlist</source>
         <translation>Nueva lista de reproducción</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="639"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="661"/>
         <source>Go &amp;offline</source>
         <translation>&amp;Desconectarse</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="668"/>
         <source>Go &amp;online</source>
         <translation>&amp;Conectarse</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="693"/>
         <source>Authentication Error</source>
         <translation>Error de autenticación</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="708"/>
         <source>%1 by %2</source>
         <comment>track, artist name</comment>
         <translation>%1 por %2</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="709"/>
         <source>%1 - %2</source>
         <comment>current track, some window title</comment>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="717"/>
         <source>About Tomahawk</source>
         <translation>Acerca de Tomahawk</translation>
     </message>
     <message>
-        <location filename="tomahawkwindow.cpp" line="718"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;Copyright 2010, 2011&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</source>
         <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;Copyright 2010, 2011&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Gracias a: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter y Steve Robertson</translation>
     </message>
+    <message>
+        <source>Playback Error</source>
+        <translation>Error de reproducción</translation>
+    </message>
+    <message>
+        <source>Sorry, there is a problem accessing your audio device. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation>Hay un problema accediendo a su dispositivo de audio. Asegúrese que tiene un backend de Phonon adecuado y instalados los plugins requeridos.</translation>
+    </message>
+    <message>
+        <source>Sorry, there is a problem accessing your audio device.</source>
+        <translation>Hay un problema accediendo a su dispositivo de audio.</translation>
+    </message>
 </context>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.ui" line="26"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.ui" line="66"/>
         <source>0 Sources</source>
         <translation>0 fuentes</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.ui" line="89"/>
         <source>0 Tracks</source>
         <translation>0 pistas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.ui" line="112"/>
         <source>0 Artists</source>
-        <translation>0 Artistas</translation>
+        <translation>0 artistas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.ui" line="135"/>
         <source>0 Shown</source>
         <translation>0 mostradas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.cpp" line="48"/>
         <source>Tracks</source>
         <translation>Pistas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.cpp" line="49"/>
         <source>Artists</source>
         <translation>Artistas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.cpp" line="53"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.cpp" line="83"/>
         <source>Artist View</source>
         <translation>Vista de artista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.cpp" line="84"/>
         <source>Flat View</source>
         <translation>Vista simple</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.cpp" line="194"/>
         <source>Sources</source>
         <translation>Fuentes</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/topbar/topbar.cpp" line="246"/>
         <source>Shown</source>
         <translation>Mostradas</translation>
     </message>
@@ -2462,7 +2241,6 @@ introduzca el número PIN aquí:</translation>
 <context>
     <name>TopTracksContext</name>
     <message>
-        <location filename="libtomahawk/context/pages/TopTracksContext.h" line="45"/>
         <source>Top Hits</source>
         <translation>Grandes éxitos</translation>
     </message>
@@ -2470,57 +2248,46 @@ introduzca el número PIN aquí:</translation>
 <context>
     <name>TrackModel</name>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Artist</source>
         <translation>Artista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Track</source>
         <translation>Pista</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Bitrate</source>
         <translation>Bitrate</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Age</source>
         <translation>Edad</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Year</source>
         <translation>Año</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Origin</source>
         <translation>Origen</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/trackmodel.cpp" line="234"/>
         <source>Score</source>
         <translation>Puntuación</translation>
     </message>
@@ -2528,7 +2295,6 @@ introduzca el número PIN aquí:</translation>
 <context>
     <name>TrackView</name>
     <message>
-        <location filename="libtomahawk/playlist/trackview.cpp" line="374"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Lo siento, tu filtro &apos;%1&apos; no ha encontrado resultados.</translation>
     </message>
@@ -2536,12 +2302,10 @@ introduzca el número PIN aquí:</translation>
 <context>
     <name>TransferStatusItem</name>
     <message>
-        <location filename="libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
         <source>from</source>
         <translation>de</translation>
     </message>
     <message>
-        <location filename="libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
         <source>to</source>
         <translation>para</translation>
     </message>
@@ -2549,7 +2313,6 @@ introduzca el número PIN aquí:</translation>
 <context>
     <name>TreeItemDelegate</name>
     <message>
-        <location filename="libtomahawk/playlist/treeitemdelegate.cpp" line="134"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -2557,54 +2320,42 @@ introduzca el número PIN aquí:</translation>
 <context>
     <name>TreeModel</name>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="371"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="371"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="371"/>
         <source>Bitrate</source>
         <translation>Bitrate</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="371"/>
         <source>Age</source>
         <translation>Edad</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="371"/>
         <source>Year</source>
         <translation>Año</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="371"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="371"/>
         <source>Origin</source>
         <translation>Origen</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="589"/>
         <source>All Artists</source>
         <translation>Todos los artistas</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="701"/>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="726"/>
         <source>My Collection</source>
         <translation>Mi colección</translation>
     </message>
     <message>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="703"/>
-        <location filename="libtomahawk/playlist/treemodel.cpp" line="728"/>
         <source>Collection of %1</source>
         <translation>Colección de %1</translation>
     </message>
@@ -2612,41 +2363,33 @@ introduzca el número PIN aquí:</translation>
 <context>
     <name>TwitterConfigWidget</name>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="73"/>
         <source>Configure this Twitter account</source>
         <translation>Configurar esta cuenta de Twitter</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="119"/>
         <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
-        <translation>El plugin de Twitter te permite descubrir y reproducir música de tus amigos de Twitter que usen Tomahawk y publicar mensajes en tu cuenta.</translation>
+        <translation>El plugin de Twitter le permite descubrir y reproducir música de sus amigos de Twitter que usen Tomahawk y además, publicar mensajes en tu cuenta.</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="137"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="56"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="150"/>
         <source>Status: No saved credentials</source>
         <translation>Estado: No hay credenciales guardadas</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="166"/>
         <source>Authenticate with Twitter</source>
         <translation>Autenticarse con Twitter</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="196"/>
         <source>Twitter Connections</source>
         <translation>Conexiones de Twitter</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="202"/>
         <source>
 If you only want to post tweets, you&apos;re done.
 
 If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message.  You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
 
 You can re-send a sync message at any time simply by sending another tweet using the button.</source>
-        <translation>
+        <translation type="obsolete">
 Si sólo quiere postear tweets, ya está listo.
 
 Si quiere conectarse Tomahawk con sus amigos usando Twitter, seleccione el tipo de tweet y seleccione el botón siguiente para mandar un mensaje de sincronización. Deben seguirse mutuamente, ya que son usados mensajes directos. ¡Debe ser (muy) paciente -- puede llevar varios minutos!
@@ -2654,148 +2397,121 @@ Si quiere conectarse Tomahawk con sus amigos usando Twitter, seleccione el tipo
 Puede reenviar el mensaje de sincronización en cualquier momento simplemente enviando otro tweet usando el botón.</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="244"/>
         <source>Select the kind of tweet you would like, then press the button to post it:</source>
         <translation>Seleccione el tipo de tweet, y pulse el botón para enviarlo:</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="276"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="162"/>
         <source>Global Tweet</source>
         <translation>Tweet global</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="281"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="169"/>
         <source>@Mention</source>
         <translation>@Mención</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="286"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="167"/>
         <source>Direct Message</source>
         <translation>Mensaje directo</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="322"/>
         <source>e.g. @tomahawk</source>
         <translation>p. ej. @tomahawk</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.ui" line="351"/>
         <source>Send Message</source>
         <translation>Enviar mensaje</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="52"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="124"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="172"/>
         <source>Tweet!</source>
-        <translation>¡Twitear!</translation>
+        <translation>¡Tweet!</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="57"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="82"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="151"/>
         <source>Authenticate</source>
-        <translation>Autenticar</translation>
+        <translation>Autenticarse</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="64"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="119"/>
         <source>Status: Credentials saved for %1</source>
         <translation>Estado: Credenciales guardadas para %1</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="65"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="120"/>
         <source>De-authenticate</source>
-        <translation>De-autenticarse</translation>
+        <translation>Desautenticarse</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="110"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="183"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="190"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="208"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="250"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="259"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="269"/>
         <source>Tweetin&apos; Error</source>
         <translation>Error de tweet</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="110"/>
         <source>The credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation>Las credenciales no pudieron ser verificadas.
 Si lo desea puede volver a autenticarse.</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="137"/>
         <source>Status: Error validating credentials</source>
         <translation>Estado: error al validar las credenciales</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="168"/>
         <source>Send Message!</source>
         <translation>¡Enviar mensaje!</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="170"/>
         <source>Send Mention!</source>
         <translation>¡Enviar mención!</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="183"/>
         <source>You must enter a user name for this type of tweet.</source>
         <translation>Debe introducir un nombre de usuario para este tipo de tweet.</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="190"/>
         <source>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</source>
         <translation>Sus credenciales guardadas no pudieron ser cargadas.
 Si lo desea puede volver a autenticarse.</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="208"/>
         <source>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation>Sus credenciales guardadas no pudieron ser verificadas.
 Si lo desea puede volver a autenticarse.</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="250"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="269"/>
         <source>There was an error posting your status -- sorry!</source>
         <translation>Hubo un error al enviar su estado -- ¡lo siento!</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="252"/>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="261"/>
         <source>Tweeted!</source>
-        <translation>¡Twiteado!</translation>
+        <translation>¡Tweeteado!</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="252"/>
         <source>Your tweet has been posted!</source>
         <translation>¡Su tweet ha sido enviado!</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="259"/>
         <source>There was an error posting your direct message -- sorry!</source>
         <translation>Hubo un error al enviar su mensaje directo -- ¡lo siento!</translation>
     </message>
     <message>
-        <location filename="sip/twitter/twitterconfigwidget.cpp" line="261"/>
         <source>Your message has been posted!</source>
         <translation>¡Su mensaje ha sido enviado!</translation>
     </message>
+    <message>
+        <source>
+If you only want to post tweets, you&apos;re done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation>
+Si sólo desea enviar tweets, ya está listo.
+
+Si quiere conectar Tomahawk con sus amigos usando Twitter, seleccione el tipo de tweet y pulse el botón siguiente para mandar un mensaje de sincronización. Deben seguirse mutuamente, ya que se emplean los mensajes directos. ¡Debe ser (muy) paciente -- puede llevar varios minutos!
+
+Puede reenviar el mensaje de sincronización en cualquier momento simplemente enviando otro tweet mediante el botón.</translation>
+    </message>
 </context>
 <context>
     <name>TwitterPlugin</name>
     <message>
-        <location filename="sip/twitter/twitter.cpp" line="129"/>
         <source>Twitter</source>
         <translation>Twitter</translation>
     </message>
@@ -2803,40 +2519,33 @@ Si lo desea puede volver a autenticarse.</translation>
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="libtomahawk/viewmanager.cpp" line="364"/>
         <source>All available tracks</source>
         <translation>Todas las pistas disponibles</translation>
     </message>
     <message>
-        <location filename="libtomahawk/viewmanager.cpp" line="365"/>
         <source>All available albums</source>
-        <translation>Todas los álbumes disponibles</translation>
+        <translation>Todos los álbumes disponibles</translation>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
-        <location filename="libtomahawk/widgets/welcomewidget.ui" line="34"/>
         <source>Recent Additions</source>
         <translation>Añadidos recientemente</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/welcomewidget.ui" line="55"/>
         <source>Newest Stations &amp; Playlists</source>
         <translation>Nuevas estaciones y listas de reproducción</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/welcomewidget.ui" line="70"/>
         <source>Recently Played Tracks</source>
         <translation>Pistas reproducidas recientemente</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/welcomewidget.cpp" line="131"/>
         <source>No recently created playlists in your network.</source>
-        <translation>No hay listas de reproducción recientemente creadas en tu red.</translation>
+        <translation>No hay listas de reproducción recientemente creadas en su red.</translation>
     </message>
     <message>
-        <location filename="libtomahawk/widgets/welcomewidget.h" line="89"/>
         <source>Welcome to Tomahawk</source>
         <translation>Bienvenido a Tomahawk</translation>
     </message>
@@ -2844,7 +2553,6 @@ Si lo desea puede volver a autenticarse.</translation>
 <context>
     <name>WhatsHotWidget</name>
     <message>
-        <location filename="libtomahawk/widgets/whatshotwidget.h" line="63"/>
         <source>Charts</source>
         <translation>Listas de éxitos</translation>
     </message>
@@ -2852,7 +2560,6 @@ Si lo desea puede volver a autenticarse.</translation>
 <context>
     <name>WikipediaContext</name>
     <message>
-        <location filename="libtomahawk/context/pages/WikipediaContext.h" line="39"/>
         <source>Wikipedia</source>
         <translation>Wikipedia</translation>
     </message>
@@ -2860,7 +2567,6 @@ Si lo desea puede volver a autenticarse.</translation>
 <context>
     <name>XMPPBot</name>
     <message>
-        <location filename="xmppbot/xmppbot.cpp" line="311"/>
         <source>
 Terms for %1:
 </source>
@@ -2868,12 +2574,10 @@ Terms for %1:
 Términos de %1:</translation>
     </message>
     <message>
-        <location filename="xmppbot/xmppbot.cpp" line="313"/>
         <source>No terms found, sorry.</source>
         <translation>No se encuentran términos, lo siento.</translation>
     </message>
     <message>
-        <location filename="xmppbot/xmppbot.cpp" line="346"/>
         <source>
 Hotttness for %1: %2
 </source>
@@ -2882,7 +2586,6 @@ Actualidad de %1: %2
 </translation>
     </message>
     <message>
-        <location filename="xmppbot/xmppbot.cpp" line="362"/>
         <source>
 Familiarity for %1: %2
 </source>
@@ -2891,7 +2594,6 @@ Familiaridad de %1: %2
 </translation>
     </message>
     <message>
-        <location filename="xmppbot/xmppbot.cpp" line="380"/>
         <source>
 Lyrics for &quot;%1&quot; by %2:
 
@@ -2907,7 +2609,6 @@ Letras de &quot;%1&quot; por %2:
 <context>
     <name>XSPFLoader</name>
     <message>
-        <location filename="libtomahawk/utils/xspfloader.cpp" line="156"/>
         <source>New Playlist</source>
         <translation>Nueva lista de reproducción</translation>
     </message>
@@ -2915,78 +2616,62 @@ Letras de &quot;%1&quot; por %2:
 <context>
     <name>XmlConsole</name>
     <message>
-        <location filename="sip/jabber/xmlconsole.ui" line="14"/>
         <source>Xml stream console</source>
         <translation>Consola XML de stream</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.ui" line="33"/>
-        <location filename="sip/jabber/xmlconsole.cpp" line="59"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.ui" line="43"/>
         <source>Save log</source>
         <translation>Guardar log</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="61"/>
         <source>Disabled</source>
         <translation>Desactivado</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="64"/>
         <source>By JID</source>
         <translation>Por JID</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="67"/>
         <source>By namespace uri</source>
         <translation>Por uri de namespace</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="70"/>
         <source>By all attributes</source>
         <translation>Por todos los atributos</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="75"/>
         <source>Visible stanzas</source>
         <translation>Estrofas visibles</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="78"/>
         <source>Information query</source>
         <translation>Consulta de información</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="82"/>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="86"/>
         <source>Presence</source>
         <translation>Presencia</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="90"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="106"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="351"/>
         <source>Save XMPP log to file</source>
         <translation>Guardar XMPP log en un archivo</translation>
     </message>
     <message>
-        <location filename="sip/jabber/xmlconsole.cpp" line="352"/>
         <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
         <translation>Formato OpenDocument (*.odf);; archivo HTML (*.html);;texto plano (*.txt)</translation>
     </message>
@@ -2994,24 +2679,20 @@ Letras de &quot;%1&quot; por %2:
 <context>
     <name>ZeroconfConfig</name>
     <message>
-        <location filename="sip/zeroconf/configwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="sip/zeroconf/configwidget.ui" line="55"/>
         <source>Local Network configuration</source>
         <translation>Configuración de red local</translation>
     </message>
     <message>
-        <location filename="sip/zeroconf/configwidget.ui" line="77"/>
         <source>This plugin will automatically find other users running Tomahawk on your local network</source>
         <translation>Este plugin encontrará automáticamente a otros usuarios que estén ejecutando Tomahawk en su red local</translation>
     </message>
     <message>
-        <location filename="sip/zeroconf/configwidget.ui" line="84"/>
         <source>Connect automatically when Tomahawk starts</source>
-        <translation>Conectar automáticamente cuando se inicia Tomahawk</translation>
+        <translation>Conectar automáticamente cuando se inicie Tomahawk</translation>
     </message>
 </context>
 </TS>