mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into notificationcleanup

Browse Source
This commit is contained in:
Jeff Mitchell
2012-04-08 19:31:31 -04:00
parent 7914fc9551 41a3cea05e
commit 8bb31492e4
14 changed files with 185 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lang/tomahawk_bg.ts
View File

@@ -333,17 +333,17 @@ Remember: Only allow peers to connect if you trust who they are and if you have
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawk е спрян</translation> <translation>Tomahawk е спрян</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation>Tomahawk изпълнява &quot;%1&quot; от %2%3.</translation> <translation>Tomahawk изпълнява &quot;%1&quot; от %2%3.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation>от албум %1</translation> <translation>от албум %1</translation>
</message> </message>
@@ -2311,27 +2311,27 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation>Най-актуални песни</translation> <translation>Най-актуални песни</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation>Харесвани песни</translation> <translation>Харесвани песни</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation>Песни слушани най-често</translation> <translation>Песни слушани най-често</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation>Най-слушани артисти</translation> <translation>Най-слушани артисти</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation>Артисти слушани най-често</translation> <translation>Артисти слушани най-често</translation>
</message> </message>
@@ -2389,37 +2389,37 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation>и</translation> <translation>и</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation>Ти</translation> <translation>Ти</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation>ти</translation> <translation>ти</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation>и</translation> <translation>и</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation><numerusform>%n друг</numerusform><numerusform>%n други</numerusform></translation> <translation><numerusform>%n друг</numerusform><numerusform>%n други</numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation>%1 хора</translation> <translation>%1 хора</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation>хареса тази песен</translation> <translation>хареса тази песен</translation>
</message> </message>
@@ -2485,7 +2485,7 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation>Моята колекция</translation> <translation>Моята колекция</translation>
</message> </message>

32
lang/tomahawk_de.ts
View File

@@ -333,17 +333,17 @@ Denk dran: Erlaube das nur, wenn du dem Anderen vertraust und du die Rechte zum
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawk ist gestoppt.</translation> <translation>Tomahawk ist gestoppt.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation>Tomahawk spielt &quot;%1&quot; von %2%3.</translation> <translation>Tomahawk spielt &quot;%1&quot; von %2%3.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation>auf dem Album %1</translation> <translation>auf dem Album %1</translation>
</message> </message>
@@ -2302,27 +2302,27 @@ Versuch die Filter anzupassen für neue Lieder.</translation>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation>Größte Hits</translation> <translation>Größte Hits</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation>Lieblings Lieder</translation> <translation>Lieblings Lieder</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation>Angesagte Stücke</translation> <translation>Angesagte Stücke</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2380,37 +2380,37 @@ Versuch die Filter anzupassen für neue Lieder.</translation>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2476,7 +2476,7 @@ Versuch die Filter anzupassen für neue Lieder.</translation>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation>Meine Sammlung</translation> <translation>Meine Sammlung</translation>
</message> </message>

32
lang/tomahawk_en.ts
View File

@@ -333,17 +333,17 @@ Remember: Only allow peers to connect if you trust who they are and if you have
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawk is stopped.</translation> <translation>Tomahawk is stopped.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation>Tomahawk is playing &quot;%1&quot; by %2%3.</translation> <translation>Tomahawk is playing &quot;%1&quot; by %2%3.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation>on album %1</translation> <translation>on album %1</translation>
</message> </message>
@@ -2309,27 +2309,27 @@ Try tweaking the filters for a new set of songs to play.</translation>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation>Top Tracks</translation> <translation>Top Tracks</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation>Loved Tracks</translation> <translation>Loved Tracks</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation>Hyped Tracks</translation> <translation>Hyped Tracks</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation>Top Artists</translation> <translation>Top Artists</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation>Hyped Artists</translation> <translation>Hyped Artists</translation>
</message> </message>
@@ -2387,37 +2387,37 @@ Try tweaking the filters for a new set of songs to play.</translation>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation> and </translation> <translation> and </translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation>You</translation> <translation>You</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation>you</translation> <translation>you</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation>and</translation> <translation>and</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation><numerusform>%n other</numerusform><numerusform>%n others</numerusform></translation> <translation><numerusform>%n other</numerusform><numerusform>%n others</numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation>%1 people</translation> <translation>%1 people</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation>loved this track</translation> <translation>loved this track</translation>
</message> </message>
@@ -2483,7 +2483,7 @@ Try tweaking the filters for a new set of songs to play.</translation>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation>My Collection</translation> <translation>My Collection</translation>
</message> </message>

32
lang/tomahawk_es.ts
View File

@@ -331,17 +331,17 @@ Remember: Only allow peers to connect if you trust who they are and if you have
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawk está parado.</translation> <translation>Tomahawk está parado.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation>Tomahawk está reproduciendo &quot;%1&quot; de %2%3.</translation> <translation>Tomahawk está reproduciendo &quot;%1&quot; de %2%3.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2301,27 +2301,27 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation>Pistas más escuchadas</translation> <translation>Pistas más escuchadas</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation>Pistas favoritas</translation> <translation>Pistas favoritas</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation>Pistas en alza</translation> <translation>Pistas en alza</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation>Artistas más escuchados</translation> <translation>Artistas más escuchados</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation>Artistas en alza</translation> <translation>Artistas en alza</translation>
</message> </message>
@@ -2379,37 +2379,37 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2475,7 +2475,7 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation>Mi colección</translation> <translation>Mi colección</translation>
</message> </message>

32
lang/tomahawk_ja.ts
View File

@@ -331,17 +331,17 @@ Remember: Only allow peers to connect if you trust who they are and if you have
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawkは中止しています。</translation> <translation>Tomahawkは中止しています。</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2298,27 +2298,27 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2376,37 +2376,37 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation> <translation type="unfinished"><numerusform></numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2472,7 +2472,7 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>

32
lang/tomahawk_pl.ts
View File

@@ -331,17 +331,17 @@ Remember: Only allow peers to connect if you trust who they are and if you have
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawk jest zatrzymany.</translation> <translation>Tomahawk jest zatrzymany.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation>Tomahawk odtwarza &quot;%1&quot; wykonawcy %2%3.</translation> <translation>Tomahawk odtwarza &quot;%1&quot; wykonawcy %2%3.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation>z albumu %1</translation> <translation>z albumu %1</translation>
</message> </message>
@@ -2302,27 +2302,27 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2380,37 +2380,37 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2476,7 +2476,7 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation>Moja Kolekcja</translation> <translation>Moja Kolekcja</translation>
</message> </message>

32
lang/tomahawk_pt_BR.ts
View File

@@ -331,17 +331,17 @@ Remember: Only allow peers to connect if you trust who they are and if you have
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawk está inativo.</translation> <translation>Tomahawk está inativo.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation>Tomahawk está reproduzindo &quot;%1&quot; por %2%3.</translation> <translation>Tomahawk está reproduzindo &quot;%1&quot; por %2%3.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2301,27 +2301,27 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation>Faixas principais</translation> <translation>Faixas principais</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation>Faixas favoritas</translation> <translation>Faixas favoritas</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation>Faixas mais populares</translation> <translation>Faixas mais populares</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation>Artistas principais</translation> <translation>Artistas principais</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation>Artistas mais populares</translation> <translation>Artistas mais populares</translation>
</message> </message>
@@ -2379,37 +2379,37 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2475,7 +2475,7 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation>Minha biblioteca</translation> <translation>Minha biblioteca</translation>
</message> </message>

32
lang/tomahawk_ru.ts
View File

@@ -331,17 +331,17 @@ Remember: Only allow peers to connect if you trust who they are and if you have
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawk остановлен.</translation> <translation>Tomahawk остановлен.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation>Tomahawk играет &quot;%1&quot; by %2%3.</translation> <translation>Tomahawk играет &quot;%1&quot; by %2%3.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation>на альбом %1</translation> <translation>на альбом %1</translation>
</message> </message>
@@ -2298,27 +2298,27 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation>Топ песен</translation> <translation>Топ песен</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation>Любимые песни</translation> <translation>Любимые песни</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation>Любимые исполнители</translation> <translation>Любимые исполнители</translation>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2376,37 +2376,37 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation>Ты</translation> <translation>Ты</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation>ты</translation> <translation>ты</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation>и</translation> <translation>и</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation>любимый</translation> <translation>любимый</translation>
</message> </message>
@@ -2472,7 +2472,7 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation>Моя коллекция</translation> <translation>Моя коллекция</translation>
</message> </message>

32
lang/tomahawk_sv.ts
View File

@@ -333,17 +333,17 @@ Kom ihåg: Tillåt endast anslutning från klienter du litar på, och som har la
<context> <context>
<name>AudioEngine</name> <name>AudioEngine</name>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="201"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="203"/>
<source>Tomahawk is stopped.</source> <source>Tomahawk is stopped.</source>
<translation>Tomahawk är stoppad.</translation> <translation>Tomahawk är stoppad.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="371"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="375"/>
<source>Tomahawk is playing &quot;%1&quot; by %2%3.</source> <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
<translation>Tomahawk spelar upp &quot;%1&quot; av %2%3.</translation> <translation>Tomahawk spelar upp &quot;%1&quot; av %2%3.</translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/audio/audioengine.cpp" line="374"/> <location filename="../src/libtomahawk/audio/audioengine.cpp" line="378"/>
<source>on album %1</source> <source>on album %1</source>
<translation>på album %1</translation> <translation>på album %1</translation>
</message> </message>
@@ -2299,27 +2299,27 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::InfoSystem::LastFmPlugin</name> <name>Tomahawk::InfoSystem::LastFmPlugin</name>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="399"/>
<source>Top Tracks</source> <source>Top Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="402"/>
<source>Loved Tracks</source> <source>Loved Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="405"/>
<source>Hyped Tracks</source> <source>Hyped Tracks</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="411"/>
<source>Top Artists</source> <source>Top Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/> <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="414"/>
<source>Hyped Artists</source> <source>Hyped Artists</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2377,37 +2377,37 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>Tomahawk::Query</name> <name>Tomahawk::Query</name>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="637"/> <location filename="../src/libtomahawk/query.cpp" line="639"/>
<source> and </source> <source> and </source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="645"/> <location filename="../src/libtomahawk/query.cpp" line="647"/>
<source>You</source> <source>You</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="647"/> <location filename="../src/libtomahawk/query.cpp" line="649"/>
<source>you</source> <source>you</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>and</source> <source>and</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libtomahawk/query.cpp" line="656"/> <location filename="../src/libtomahawk/query.cpp" line="658"/>
<source>%n other(s)</source> <source>%n other(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="659"/> <location filename="../src/libtomahawk/query.cpp" line="661"/>
<source>%1 people</source> <source>%1 people</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libtomahawk/query.cpp" line="661"/> <location filename="../src/libtomahawk/query.cpp" line="663"/>
<source>loved this track</source> <source>loved this track</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@@ -2473,7 +2473,7 @@ Try tweaking the filters for a new set of songs to play.</source>
<context> <context>
<name>TomahawkApp</name> <name>TomahawkApp</name>
<message> <message>
<location filename="../src/tomahawkapp.cpp" line="534"/> <location filename="../src/tomahawkapp.cpp" line="535"/>
<source>My Collection</source> <source>My Collection</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>

6
src/audiocontrols.cpp
View File

@@ -271,10 +271,10 @@ AudioControls::setCover()
{ {
QPixmap cover; QPixmap cover;
cover = m_currentTrack->toQuery()->cover( ui->coverImage->size() ); cover = m_currentTrack->toQuery()->cover( ui->coverImage->size() );
ui->coverImage->setPixmap( cover ); ui->coverImage->setPixmap( cover, false );
} }
else else
ui->coverImage->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, ui->coverImage->size() ) ); ui->coverImage->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, ui->coverImage->size() ), true );
} }
@@ -346,7 +346,7 @@ AudioControls::onPlaybackStopped()
ui->ownerLabel->setText( "" ); ui->ownerLabel->setText( "" );
ui->timeLabel->setText( "" ); ui->timeLabel->setText( "" );
ui->timeLeftLabel->setText( "" ); ui->timeLeftLabel->setText( "" );
ui->coverImage->setPixmap( QPixmap() ); ui->coverImage->setPixmap( QPixmap(), true );
ui->seekSlider->setVisible( false ); ui->seekSlider->setVisible( false );
m_sliderTimeLine.stop(); m_sliderTimeLine.stop();
m_sliderTimeLine.setCurrentTime( 0 ); m_sliderTimeLine.setCurrentTime( 0 );

12
src/libtomahawk/utils/PixmapDelegateFader.cpp
View File

@@ -106,8 +106,6 @@ PixmapDelegateFader::init()
m_current = QPixmap( m_size ); m_current = QPixmap( m_size );
m_current.fill( Qt::transparent ); m_current.fill( Qt::transparent );
stlInstance().data()->setUpdateInterval( 20 );
if ( m_currentReference.isNull() ) if ( m_currentReference.isNull() )
{ {
// No cover loaded yet, use default and don't fade in // No cover loaded yet, use default and don't fade in
@@ -135,7 +133,7 @@ PixmapDelegateFader::albumChanged()
if ( m_album.isNull() ) if ( m_album.isNull() )
return; return;
setPixmap( m_album->cover( m_size ) ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_album->cover( m_size ) ) );
} }
void void
@@ -144,7 +142,7 @@ PixmapDelegateFader::artistChanged()
if ( m_artist.isNull() ) if ( m_artist.isNull() )
return; return;
setPixmap( m_artist->cover( m_size ) ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_artist->cover( m_size ) ) );
} }
@@ -154,7 +152,7 @@ PixmapDelegateFader::trackChanged()
if ( m_track.isNull() ) if ( m_track.isNull() )
return; return;
setPixmap( m_track->cover( m_size ) ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_track->cover( m_size ) ) );
} }
@@ -183,6 +181,7 @@ PixmapDelegateFader::setPixmap( const QPixmap& pixmap )
m_oldReference = m_currentReference; m_oldReference = m_currentReference;
m_currentReference = pixmap; m_currentReference = pixmap;
stlInstance().data()->setUpdateInterval( 20 );
m_startFrame = stlInstance().data()->currentFrame(); m_startFrame = stlInstance().data()->currentFrame();
m_connectedToStl = true; m_connectedToStl = true;
m_fadePct = 0; m_fadePct = 0;
@@ -270,13 +269,12 @@ void
PixmapDelegateFader::onAnimationFinished() PixmapDelegateFader::onAnimationFinished()
{ {
m_oldReference = QPixmap(); m_oldReference = QPixmap();
onAnimationStep( INT_MAX );
m_connectedToStl = false; m_connectedToStl = false;
disconnect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) ); disconnect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
if ( !m_pixmapQueue.isEmpty() ) if ( !m_pixmapQueue.isEmpty() )
setPixmap( m_pixmapQueue.dequeue() ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_pixmapQueue.dequeue() ) );
} }

4
src/libtomahawk/utils/PixmapDelegateFader.h
View File

@@ -51,8 +51,6 @@ public:
virtual ~PixmapDelegateFader(); virtual ~PixmapDelegateFader();
void setPixmap( const QPixmap& pixmap );
QPixmap currentPixmap() const; QPixmap currentPixmap() const;
signals: signals:
@@ -65,6 +63,8 @@ private slots:
void onAnimationStep( int ); void onAnimationStep( int );
void onAnimationFinished(); void onAnimationFinished();
void setPixmap( const QPixmap& pixmap );
private: private:
void init(); void init();

38
src/libtomahawk/widgets/FadingPixmap.cpp
View File

@@ -44,6 +44,7 @@ FadingPixmap::FadingPixmap( QWidget* parent )
, m_oldPixmap( QPixmap() ) , m_oldPixmap( QPixmap() )
, m_fadePct( 100 ) , m_fadePct( 100 )
, m_startFrame( 0 ) , m_startFrame( 0 )
, m_isDefault( true )
{ {
// setCursor( Qt::PointingHandCursor ); // setCursor( Qt::PointingHandCursor );
} }
@@ -71,44 +72,59 @@ FadingPixmap::onAnimationStep( int frame )
void void
FadingPixmap::onAnimationFinished() FadingPixmap::onAnimationFinished()
{ {
tDebug() << Q_FUNC_INFO;
m_oldPixmap = QPixmap(); m_oldPixmap = QPixmap();
repaint(); repaint();
disconnect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) ); disconnect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
if ( m_pixmapQueue.count() ) if ( m_pixmapQueue.count() )
setPixmap( m_pixmapQueue.takeFirst() ); QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_pixmapQueue.takeFirst() ), Q_ARG( bool, false ) );
} }
void void
FadingPixmap::setPixmap( const QPixmap& pixmap, bool clearQueue ) FadingPixmap::setPixmap( const QPixmap& pixmap, bool isDefault )
{ {
tDebug() << Q_FUNC_INFO << "isDefault is " << ( isDefault ? "true" : "false" );
if ( !m_oldPixmap.isNull() && !isDefault )
{
tDebug() << Q_FUNC_INFO << "adding pixmap to queue and clearing queue";
m_pixmapQueue.clear();
m_pixmapQueue << pixmap;
if ( m_isDefault )
QTimer::singleShot( 0, this, SLOT( onAnimationFinished() ) );
return;
}
if ( m_isDefault && isDefault )
{
tDebug() << Q_FUNC_INFO << "moving from default to default, doing nothing";
return;
}
QByteArray ba; QByteArray ba;
QBuffer buffer( &ba ); QBuffer buffer( &ba );
buffer.open( QIODevice::WriteOnly ); buffer.open( QIODevice::WriteOnly );
pixmap.save( &buffer, "PNG" ); pixmap.save( &buffer, "PNG" );
QString newImageMd5 = TomahawkUtils::md5( buffer.data() ); QString newImageMd5 = TomahawkUtils::md5( buffer.data() );
if ( m_oldImageMd5 == newImageMd5 ) if ( m_oldImageMd5 == newImageMd5 )
return;
m_oldImageMd5 = newImageMd5;
if ( !m_oldPixmap.isNull() )
{ {
if ( clearQueue ) tDebug() << Q_FUNC_INFO << "md5s match, doing nothing";
m_pixmapQueue.clear();
m_pixmapQueue << pixmap;
return; return;
} }
m_oldImageMd5 = newImageMd5;
m_oldPixmap = m_pixmap; m_oldPixmap = m_pixmap;
m_pixmap = pixmap; m_pixmap = pixmap;
stlInstance().data()->setUpdateInterval( 20 ); stlInstance().data()->setUpdateInterval( 20 );
m_startFrame = stlInstance().data()->currentFrame(); m_startFrame = stlInstance().data()->currentFrame();
m_fadePct = 0; m_fadePct = 0;
m_isDefault = isDefault;
tDebug() << Q_FUNC_INFO << "connecting to timeline";
connect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) ); connect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
} }

4
src/libtomahawk/widgets/FadingPixmap.h
View File

@@ -44,7 +44,7 @@ public:
virtual ~FadingPixmap(); virtual ~FadingPixmap();
public slots: public slots:
virtual void setPixmap( const QPixmap& pixmap, bool clearQueue = true ); virtual void setPixmap( const QPixmap& pixmap, bool isDefault );
void onAnimationStep( int frame ); void onAnimationStep( int frame );
signals: signals:
@@ -66,8 +66,8 @@ private:
QList<QPixmap> m_pixmapQueue; QList<QPixmap> m_pixmapQueue;
int m_fadePct; int m_fadePct;
int m_startFrame; int m_startFrame;
bool m_isDefault;
static QWeakPointer< TomahawkUtils::SharedTimeLine > s_stlInstance; static QWeakPointer< TomahawkUtils::SharedTimeLine > s_stlInstance;
}; };