From 3e577cc8eec2194f7676e102086c75383230dc06 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Mon, 24 Dec 2012 21:28:06 +0100
Subject: [PATCH 1/3] Fix the header gradient rect issue for headers other than
BasicHeader.
---
src/libtomahawk/infobar/InfoBar.cpp | 2 +-
src/libtomahawk/widgets/HeaderWidget.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libtomahawk/infobar/InfoBar.cpp b/src/libtomahawk/infobar/InfoBar.cpp
index c0a2b0bd3..646a6e735 100644
--- a/src/libtomahawk/infobar/InfoBar.cpp
+++ b/src/libtomahawk/infobar/InfoBar.cpp
@@ -297,7 +297,7 @@ InfoBar::paintEvent( QPaintEvent* event )
gradient.setColorAt( 1.0, QColor( "#25292c" ) );
painter.setBrush( gradient );
- painter.fillRect( event->rect(), gradient );
+ painter.fillRect( rect(), gradient );
}
diff --git a/src/libtomahawk/widgets/HeaderWidget.cpp b/src/libtomahawk/widgets/HeaderWidget.cpp
index c35b86013..b40fdb68c 100644
--- a/src/libtomahawk/widgets/HeaderWidget.cpp
+++ b/src/libtomahawk/widgets/HeaderWidget.cpp
@@ -40,7 +40,7 @@ void
HeaderWidget::paintEvent( QPaintEvent* e )
{
QStylePainter p( this );
- QRect r = e->rect();
+ QRect r = rect();
StyleHelper::horizontalHeader( &p, r );
}
From a5868d834d011a86a461cbc1a0c9dbb04ce7ee37 Mon Sep 17 00:00:00 2001
From: Tomahawk CI <ci@tomahawk-player.org>
Date: Tue, 25 Dec 2012 01:16:57 +0100
Subject: [PATCH 2/3] Automatic merge of Transifex translations
---
lang/tomahawk_bg.ts | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts
index 1ccdce387..fe4777ae3 100644
--- a/lang/tomahawk_bg.ts
+++ b/lang/tomahawk_bg.ts
@@ -453,9 +453,11 @@ connect and stream from you?</source>
<message utf8="true">
<location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
<source><html><head/><body><p><span style=" font-weight:600;">Sorry!</span> Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.</p></body></html></source>
- <translation><html><head/><body><p><span style=" font-weight:600;">Извинявай!</span> Tomahawk заби.
+ <translation><html><head/><body><p><span style=" font-weight:600;">
+Извинявай!</span>
+Tomahawk заби.
Моля уведоми ни за този слуай!
-Tomahaw създаде доклад относно това и изпращайки го, ще помогнеш за по-добрата работа на приложението за в бъдеще.
+Tomahawk създаде доклад относно това и изпращайки го, ще помогнеш за по-добрата работа на приложението за в бъдеще.
Изпрати директно до разработчиците на Tomahawk</p></body></html></translation>
</message>
<message>
@@ -1020,42 +1022,42 @@ Tomahaw създаде доклад относно това и изпращай
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
<source>Accuracy</source>
- <translation type="unfinished"/>
+ <translation>Съвпадение</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="241"/>
<source>Perfect match</source>
- <translation type="unfinished"/>
+ <translation>Абсолютно</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="243"/>
<source>Very good match</source>
- <translation type="unfinished"/>
+ <translation>Много добро</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="245"/>
<source>Good match</source>
- <translation type="unfinished"/>
+ <translation>Добро</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="247"/>
<source>Vague match</source>
- <translation type="unfinished"/>
+ <translation>Горе-долу</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="249"/>
<source>Bad match</source>
- <translation type="unfinished"/>
+ <translation>Лошо</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="251"/>
<source>Very bad match</source>
- <translation type="unfinished"/>
+ <translation>Много лошо</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="253"/>
<source>Not available</source>
- <translation type="unfinished"/>
+ <translation>Няма съвпадение</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
@@ -4250,7 +4252,10 @@ Lyrics for "%1" by %2:
<message>
<location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="686"/>
<source>I'm sorry -- I'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>Извинявай.. Аз съм режимът за автоматични отговори изпълзван от Tomahawk. ( http://gettomahawk.com ) Щом получаваш това съобщение, този с който се опитваш да се свържеш вероятно не е на линия. Моля, опитай отново по-късно.</translation>
+ <translation>Извинявай..
+ Аз съм режимът за автоматични отговори изпълзван от Tomahawk.
+(http://gettomahawk.com)
+Щом получаваш това съобщение, този с когото се опитваш да се свържеш вероятно не е на линия, така че опитай отново по-късно.</translation>
</message>
<message>
<location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
From 39928f0fb67833cab7e68d124392ec4b474bac09 Mon Sep 17 00:00:00 2001
From: Tomahawk CI <ci@tomahawk-player.org>
Date: Fri, 28 Dec 2012 01:17:04 +0100
Subject: [PATCH 3/3] Automatic merge of Transifex translations
---
lang/tomahawk_de.ts | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts
index b3e496a66..83f99d5aa 100644
--- a/lang/tomahawk_de.ts
+++ b/lang/tomahawk_de.ts
@@ -1017,42 +1017,42 @@ erlauben sich mit dir zu verbinden?</translation>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
<source>Accuracy</source>
- <translation type="unfinished"/>
+ <translation>Treffsicherheit</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="241"/>
<source>Perfect match</source>
- <translation type="unfinished"/>
+ <translation>Perfekt</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="243"/>
<source>Very good match</source>
- <translation type="unfinished"/>
+ <translation>Sehr gut</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="245"/>
<source>Good match</source>
- <translation type="unfinished"/>
+ <translation>Gut</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="247"/>
<source>Vague match</source>
- <translation type="unfinished"/>
+ <translation>Vage</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="249"/>
<source>Bad match</source>
- <translation type="unfinished"/>
+ <translation>Schlecht</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="251"/>
<source>Very bad match</source>
- <translation type="unfinished"/>
+ <translation>Sehr schlecht</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="253"/>
<source>Not available</source>
- <translation type="unfinished"/>
+ <translation>Nicht verfügbar</translation>
</message>
<message>
<location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>