From 89a8869be8c1e960928feb62d240f28d4df9c448 Mon Sep 17 00:00:00 2001 From: Tomahawk CI Date: Sat, 5 Jan 2013 01:16:37 +0100 Subject: [PATCH 01/13] Automatic merge of Transifex translations --- lang/tomahawk_ar.ts | 251 +++++++++------------------------ lang/tomahawk_bg.ts | 253 +++++++++------------------------ lang/tomahawk_bn_IN.ts | 251 +++++++++------------------------ lang/tomahawk_ca.ts | 251 +++++++++------------------------ lang/tomahawk_cs.ts | 251 +++++++++------------------------ lang/tomahawk_de.ts | 251 +++++++++------------------------ lang/tomahawk_el.ts | 251 +++++++++------------------------ lang/tomahawk_en.ts | 251 +++++++++------------------------ lang/tomahawk_es.ts | 251 +++++++++------------------------ lang/tomahawk_fi.ts | 251 +++++++++------------------------ lang/tomahawk_fr.ts | 251 +++++++++------------------------ lang/tomahawk_gl.ts | 251 +++++++++------------------------ lang/tomahawk_hi_IN.ts | 251 +++++++++------------------------ lang/tomahawk_hu.ts | 251 +++++++++------------------------ lang/tomahawk_it.ts | 251 +++++++++------------------------ lang/tomahawk_ja.ts | 252 +++++++++------------------------ lang/tomahawk_lt.ts | 251 +++++++++------------------------ lang/tomahawk_pl.ts | 251 +++++++++------------------------ lang/tomahawk_pt_BR.ts | 251 +++++++++------------------------ lang/tomahawk_ru.ts | 313 +++++++++++++---------------------------- lang/tomahawk_sv.ts | 251 +++++++++------------------------ lang/tomahawk_tr.ts | 251 +++++++++------------------------ lang/tomahawk_zh_CN.ts | 251 +++++++++------------------------ lang/tomahawk_zh_TW.ts | 251 +++++++++------------------------ 24 files changed, 1544 insertions(+), 4545 deletions(-) diff --git a/lang/tomahawk_ar.ts b/lang/tomahawk_ar.ts index c63dc9b29..12aa39786 100644 --- a/lang/tomahawk_ar.ts +++ b/lang/tomahawk_ar.ts @@ -117,13 +117,13 @@ connect and stream from you? - + &Listen Privately &إستمع بخصوصية - + &Listen Publicly &إستمع علنا @@ -223,32 +223,37 @@ connect and stream from you? معلومات &قانونية... - + + &View Logfile + + + + Check For Updates... تحقق من التحديثات... - + &Controls &ضوابط - + &Settings إ&عدادات - + &Help &مساعدة - + &Window &نافذة - + Main Menu القائمة الرئيسية @@ -331,37 +336,37 @@ connect and stream from you? AudioControls - + Shuffle خلط - + Repeat إعادة - + Time Elapsed الوقت المنقضي - + Time Remaining الوقت المتبقي - + Playing from %1 يتم الاستماع من %1 - + Share شارك - + Love أحب @@ -1077,31 +1082,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3327,308 +3332,178 @@ enter the displayed PIN number here: توماهوك - - &Quit - &إنهاء - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - اصبح &متصل - - - - Add &Friend... - أضف &صديق... - - - - U&pdate Collection - &تحديث المجموعة - - - - Update Collection - تحديث المجموعة - - - - &Configure Tomahawk... - &تكوين توماهوك... - - - - Load &XSPF... - تحميل XSPF&... - - - - Create &New Playlist... - إنشاء &قائمة أغاني جديدة... - - - - About &Tomahawk... - عن &توماهوك... - - - - Create New &Automatic Playlist - إنشاء قائمة أغاني جديدة أ&وتوماتيكيا - - - - Create New &Station - إنشاء &قائمة أغاني جديدة - - - - Show Offline Sources - أظهر المصادر الغير متصلة - - - - Hide Offline Sources - إخفي المصادر الغير متصلة - - - - Minimize - خفض - - - - Ctrl+M - Ctrl+M - - - - Zoom - زوم - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - معلومات &قانونية... - - - - Diagnostics... - تشخيص... - - - - Fully &Rescan Collection - إعادة &مسح المجموعة كاملة - - - - Fully Rescan Collection - إعادة مسح المجموعة كاملة - - - - Play - إستمع - - - - Space - مساحة - - - - Previous - سابق - - - - Next - التالي - - - + Back إلى الوراء - + Go back one page العودة صفحة واحدة إلى الوراء - + Forward تقدم - + Go forward one page تقدم صفحة واحدة - - + + Hide Menu Bar إخفي شريط القائمة - - + + Show Menu Bar أظهر شريط القائمة - + Search for any artist, album or song... - + &Main Menu ال&قائمة الرئيسية - - - + + + Connect To Peer ربط بالند - + Enter peer address: أدخل عنوان الند: - + Enter peer port: أدخل بوابة الند: - + Enter peer key: أدخل مفتاح الند: - + XSPF Error خطأ XSPF - + This is not a valid XSPF playlist. قائمة الأغاني XSPF هذه ليست صالحة. - + Failed to save tracks فشل في حفظ الأغاني - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. بعض الأغاني في قائمة الأغاني لا تحتوي على إسم الفنان أو إسم الأغنية. هذه الأغاني سوف تتجاهل. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. عذرا، هناك مشكلة في الوصول إلى جهاز الصوت أو الأغنية المطلوب، سوف يتم تخطي الأغنية الحالية. تأكد أن لديك خلفية فونون المناسبة والإضافات المطلوبة مثبتة. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. عذرا، هناك مشكلة في الوصول إلى جهاز الصوت أو الأغنية المطلوب، سوف يتم تخطي الأغنية الحالية. - + Station إذاعة - + Create New Station إنشاء قائمة أغاني جديدة - + Name: الاسم: - + Playlist قائمة الأغاني - + Automatic Playlist قائمة أغاني أوتوماتيكية - + Pause تعليق - + &Play &إستمع - + Authentication Error خطأ في المصادقة - + Error connecting to SIP: Authentication failed! خطأ في الاتصال بسيب (SIP): فشلت المصادقة! - + %1 by %2 track, artist name %1 من قبل %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 حقوق الطبع والنشر ٢٠١٠ - ٢٠١٢ - + Thanks to: شكر لكل من: - + About Tomahawk عن توماهوك diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts index 5d9127012..6c0a2b200 100644 --- a/lang/tomahawk_bg.ts +++ b/lang/tomahawk_bg.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately &Слушай самостоятелно - + &Listen Publicly &Слушай публично @@ -222,32 +222,37 @@ connect and stream from you? &Правна информация - + + &View Logfile + + + + Check For Updates... Провери за обновления - + &Controls &Контроли - + &Settings &Настройки - + &Help &Помощ - + &Window &Прозорец - + Main Menu Главно меню @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle Разбъркано - + Repeat Повтори - + Time Elapsed Изминало време - + Time Remaining Оставащо време - + Playing from %1 Изпълнявам от %1 - + Share Сподели - + Love Харесай @@ -1082,31 +1087,31 @@ Tomahawk създаде доклад относно това и изпращай PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you Изпълнена %1 от теб - + played %1 by %2 e.g. played 3 hours ago by SomeSource Изпълнена %1 от %2 - + added %1 e.g. added 3 hours ago Добавена %1 - + by <b>%1</b> e.g. by SomeArtist от <b>%1</b> - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum от <b>%1</b> на <b>%2</b> @@ -3341,311 +3346,181 @@ enter the displayed PIN number here: Tomahawk - - &Quit - &Изход - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - &Свържи се - - - - Add &Friend... - Добави &приятел - - - - U&pdate Collection - О&бнови колекцията - - - - Update Collection - Обнови колекцията - - - - &Configure Tomahawk... - &Настройки на Tomahawk - - - - Load &XSPF... - Зареди &XSPF... - - - - Create &New Playlist... - Зареди &Нов списък - - - - About &Tomahawk... - За &Tomahawk - - - - Create New &Automatic Playlist - Създай нов &Автоматичен списък - - - - Create New &Station - Създай нова &Станция - - - - Show Offline Sources - Покажи източници извън линия - - - - Hide Offline Sources - Скрий източници извън линия - - - - Minimize - Смали - - - - Ctrl+M - Ctrl+M - - - - Zoom - Увеличи - - - - Meta+Ctrl+Z - Mod+Ctrl+Z - - - - &Legal Info... - &Правна инфоормация - - - - Diagnostics... - Диагностика... - - - - Fully &Rescan Collection - Пълно &сканиране на колекцията - - - - Fully Rescan Collection - Пълно сканиране на колекцията - - - - Play - Изпълни - - - - Space - Интервал - - - - Previous - Предишна - - - - Next - Следваща - - - + Back Назад - + Go back one page Една страница назад - + Forward Напред - + Go forward one page Една страница напред - - + + Hide Menu Bar Скрий лентата с менюто - - + + Show Menu Bar Покажи лентата с менюто - + Search for any artist, album or song... - Търси за всеки Артист, Албум или Песен... + Търси всеки Артист, Албум или Песен... - + &Main Menu &Основно меню - - - + + + Connect To Peer Свържи се с друг потребител - + Enter peer address: Въведи адресът на отдалеченият потребител: - + Enter peer port: Въведи порт: - + Enter peer key: Въведи ключът за удостоверяване: - + XSPF Error XSPF Грешка - + This is not a valid XSPF playlist. Това не е валиден XSPF списък - + Failed to save tracks Не мога да запазя списъкът с песни - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Някои от песните в този списък нямат артист и заглавие. Те ще бъдат игнорирани. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Съжалявам. Има проблем с достъпа до твоето аудио-устройство или до избраната песен - тя ще бъде прескочена. Моля, увери се, че са инсталирани подходящ Phonon и приставки. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Съжалявам. Има проблем с достъпа до твоето аудио устройство или избраната песен. Тя ще бъде пропусната. - + Station Станция - + Create New Station Създай нова станция - + Name: Име: - + Playlist Списък - + Automatic Playlist Автоматично-генериран списък - + Pause Пауза - + &Play &Възпроизвеждане - + Authentication Error Грешка при удостоверяване - + Error connecting to SIP: Authentication failed! Грешка при свързване: Неуспешно удостоверяване! - + %1 by %2 track, artist name %1 от %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Всички права - запазени. 2010 - 2012 - + Thanks to: Благодарности на: - + About Tomahawk Относно Tomahawk diff --git a/lang/tomahawk_bn_IN.ts b/lang/tomahawk_bn_IN.ts index ef3a9f9f7..9d6c0e732 100644 --- a/lang/tomahawk_bn_IN.ts +++ b/lang/tomahawk_bn_IN.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately - + &Listen Publicly @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle - + Repeat - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3316,308 +3321,178 @@ enter the displayed PIN number here: - - &Quit - - - - - Ctrl+Q - - - - - Go &Online - - - - - Add &Friend... - - - - - U&pdate Collection - - - - - Update Collection - - - - - &Configure Tomahawk... - - - - - Load &XSPF... - - - - - Create &New Playlist... - - - - - About &Tomahawk... - - - - - Create New &Automatic Playlist - - - - - Create New &Station - - - - - Show Offline Sources - - - - - Hide Offline Sources - - - - - Minimize - - - - - Ctrl+M - - - - - Zoom - - - - - Meta+Ctrl+Z - - - - - &Legal Info... - - - - - Diagnostics... - - - - - Fully &Rescan Collection - - - - - Fully Rescan Collection - - - - - Play - - - - - Space - - - - - Previous - - - - - Next - - - - + Back - + Go back one page - + Forward - + Go forward one page - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer - + Enter peer address: - + Enter peer port: - + Enter peer key: - + XSPF Error - + This is not a valid XSPF playlist. - + Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + Station - + Create New Station - + Name: - + Playlist - + Automatic Playlist - + Pause - + &Play - + Authentication Error - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name - + %1 - %2 current track, some window title - + <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 - + Thanks to: - + About Tomahawk diff --git a/lang/tomahawk_ca.ts b/lang/tomahawk_ca.ts index 763563dc1..0721d1d4d 100644 --- a/lang/tomahawk_ca.ts +++ b/lang/tomahawk_ca.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately &Escolta privada - + &Listen Publicly &Escolta Pública @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle Mescla - + Repeat Repeteix - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3325,308 +3330,178 @@ introduïu el PIN aquí: Tomahawk - - &Quit - &Surt - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - &Connecta't - - - - Add &Friend... - Afegeix un &Amic... - - - - U&pdate Collection - Act&ualitza la Col·lecció - - - - Update Collection - Actualitza la Col·lecció - - - - &Configure Tomahawk... - &Configura Tomahawk... - - - - Load &XSPF... - Carrega una llista &XSPF... - - - - Create &New Playlist... - Crea una &nova llista de reproducció... - - - - About &Tomahawk... - Quant a &Tomahawk... - - - - Create New &Automatic Playlist - Crea una Llista de Reproducció &Automàtica - - - - Create New &Station - Crea una Nova &Emissora - - - - Show Offline Sources - Mostra les fonts fora de línia - - - - Hide Offline Sources - Amaga les fonts fora de línia - - - - Minimize - Minimitza - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zoom - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - Informació &legal - - - - Diagnostics... - Diagnòstics... - - - - Fully &Rescan Collection - &Reescaneja la Col·lecció completament - - - - Fully Rescan Collection - Reescaneja la Col·lecció completament - - - - Play - Reprodueix - - - - Space - Espai - - - - Previous - Anterior - - - - Next - Següent - - - + Back Enrere - + Go back one page Retrocedeix una pàgina - + Forward Endavant - + Go forward one page Avança una pàgina - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer Connexió Remota - + Enter peer address: Introduïu l'adreça remota: - + Enter peer port: Introduïu el port remot: - + Enter peer key: Introduïu la clau remota: - + XSPF Error Error XSPF - + This is not a valid XSPF playlist. No és una llista XSPF vàlida. - + Failed to save tracks Error en desar les cançons - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Algunes cançons de la llista no contenen ni artista ni titol i s'han ignorat. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Hi ha un problema per accedir al dispositiu de so o a la cançó. La cançó actual s'ha saltat. Assegureu-vos que teniu un back.end de Phonon adequant i els plugins necessaris instal·lats. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Hi ha un problema per accedir al dispositiu de so o a la cançó, la cançó actual s'ha saltat. - + Station Emissora - + Create New Station Crea una Nova Emissora - + Name: Nom: - + Playlist Llista - + Automatic Playlist Llista Automàtica - + Pause Pausa - + &Play - + Authentication Error Error d'autentificació - + Error connecting to SIP: Authentication failed! S'ha produït un error connectant-se a SIP: Ha fallat autentificant! - + %1 by %2 track, artist name %1 de %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010 - 2012 - + Thanks to: Gràcies a: - + About Tomahawk Quant a Tomahawk diff --git a/lang/tomahawk_cs.ts b/lang/tomahawk_cs.ts index ca69d18b7..076e7ec02 100644 --- a/lang/tomahawk_cs.ts +++ b/lang/tomahawk_cs.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately - + &Listen Publicly @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle - + Repeat - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3316,308 +3321,178 @@ enter the displayed PIN number here: - - &Quit - - - - - Ctrl+Q - - - - - Go &Online - - - - - Add &Friend... - - - - - U&pdate Collection - - - - - Update Collection - - - - - &Configure Tomahawk... - - - - - Load &XSPF... - - - - - Create &New Playlist... - - - - - About &Tomahawk... - - - - - Create New &Automatic Playlist - - - - - Create New &Station - - - - - Show Offline Sources - - - - - Hide Offline Sources - - - - - Minimize - - - - - Ctrl+M - - - - - Zoom - - - - - Meta+Ctrl+Z - - - - - &Legal Info... - - - - - Diagnostics... - - - - - Fully &Rescan Collection - - - - - Fully Rescan Collection - - - - - Play - - - - - Space - - - - - Previous - - - - - Next - - - - + Back - + Go back one page - + Forward - + Go forward one page - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer - + Enter peer address: - + Enter peer port: - + Enter peer key: - + XSPF Error - + This is not a valid XSPF playlist. - + Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + Station - + Create New Station - + Name: - + Playlist - + Automatic Playlist - + Pause - + &Play - + Authentication Error - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name - + %1 - %2 current track, some window title - + <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 - + Thanks to: - + About Tomahawk diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index d7e0bb655..7dac2bb00 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -117,13 +117,13 @@ erlauben sich mit dir zu verbinden? - + &Listen Privately &Privat Modus aktivieren - + &Listen Publicly &Privat Modus verlassen @@ -223,32 +223,37 @@ erlauben sich mit dir zu verbinden? &Rechtliche Informationen... - + + &View Logfile + &Log anzeigen + + + Check For Updates... Nach Updates suchen... - + &Controls S&teuerung - + &Settings &Einstellungen - + &Help &Hilfe - + &Window &Fenster - + Main Menu Hauptmenü @@ -331,37 +336,37 @@ erlauben sich mit dir zu verbinden? AudioControls - + Shuffle Zufall - + Repeat Wiederholen - + Time Elapsed Abgelaufene Zeit - + Time Remaining Verbleibende Zeit - + Playing from %1 Wiedergabe von %1 - + Share Teilen - + Love Lieben @@ -1077,31 +1082,31 @@ erlauben sich mit dir zu verbinden? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you angehört %1 von dir - + played %1 by %2 e.g. played 3 hours ago by SomeSource angehört %1 von %2 - + added %1 e.g. added 3 hours ago hinzugefügt %1 - + by <b>%1</b> e.g. by SomeArtist von <b>%1</b> - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum von <b>%1</b> auf <b>%2</b> @@ -3324,308 +3329,178 @@ Tomahawk auf Twitter's Website authentifiziert hast: Tomahawk - - &Quit - &Verlassen - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - &Verbinden - - - - Add &Friend... - Freund &hinzufügen… - - - - U&pdate Collection - Sammlung &aktualisieren - - - - Update Collection - Sammlung aktualisieren - - - - &Configure Tomahawk... - Tomahawk &einrichten… - - - - Load &XSPF... - &XSPF laden… - - - - Create &New Playlist... - Neue &Playlist erstellen… - - - - About &Tomahawk... - Über &Tomahawk… - - - - Create New &Automatic Playlist - Neue &automatische Playlist erstellen - - - - Create New &Station - Neue &Station erstellen - - - - Show Offline Sources - Nicht-Verfügbare Quellen anzeigen - - - - Hide Offline Sources - Nicht-Verfügbare Quellen ausblenden - - - - Minimize - Minimieren - - - - Ctrl+M - Strg+M - - - - Zoom - Vergrößern - - - - Meta+Ctrl+Z - Strg+Meta+Z - - - - &Legal Info... - Rechtliche Informationen... - - - - Diagnostics... - Diagnose Tool... - - - - Fully &Rescan Collection - Sammlung neu du&rchsuchen - - - - Fully Rescan Collection - Sammlung neu durchsuchen - - - - Play - Abspielen - - - - Space - Leertaste - - - - Previous - Zurück - - - - Next - Weiter - - - + Back Zurück - + Go back one page Gehe eine Seite zurück - + Forward Vorwärts - + Go forward one page Gehe eine Seite vorwärts - - + + Hide Menu Bar Menüleiste ausblenden - - + + Show Menu Bar Menüleiste einblenden - + Search for any artist, album or song... Suche nach Künstler, Album oder Lied... - + &Main Menu Haupt&menü - - - + + + Connect To Peer Mit anderem Tomahawk verbinden - + Enter peer address: Gib die Adresse der Gegenstelle ein: - + Enter peer port: Gib den Port der Gegenstelle ein: - + Enter peer key: Gib den Schlüssel der Gegenstelle ein: - + XSPF Error XSPF-Fehler - + This is not a valid XSPF playlist. Dies ist keine gültige XSPF-Playlist. - + Failed to save tracks Konnte Stücke nicht abspeichern - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Einige Stücke in der Playlist enthalten weder Künstler noch Titel. Diese werden ignoriert. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Es tut uns leid, Tomahawk kann auf dein Audio-Gerät oder das gewünschte Stück nicht zugreifen und überspringt es deshalb. Vergewisser dich, dass ein geignetes Phonon-Backend mitsamt benötigten Plugins installiert ist. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Es tut uns leid, Tomahawk kann auf dein Audio-Gerät oder das gewünschte Stück nicht zugreifen und überspringt es deshalb. - + Station Station - + Create New Station Neue Station erstellen - + Name: Name: - + Playlist Playlist - + Automatic Playlist Automatische Playlist - + Pause Pause - + &Play Abs&pielen - + Authentication Error Authentifizierungsfehler - + Error connecting to SIP: Authentication failed! Verbindungsfehler mit SIP: Authentifizierung fehlgeschlagen! - + %1 by %2 track, artist name %1 von %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copright 2010 - 2012 - + Thanks to: Danke an: - + About Tomahawk Über Tomahawk diff --git a/lang/tomahawk_el.ts b/lang/tomahawk_el.ts index b690fcd64..88109d01e 100644 --- a/lang/tomahawk_el.ts +++ b/lang/tomahawk_el.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately &Ιδιωτική Ακρόαση - + &Listen Publicly &Δημόσια Ακρόαση @@ -222,32 +222,37 @@ connect and stream from you? &Νομικές Πληροφορίες - + + &View Logfile + + + + Check For Updates... Έλεγχος Για Ενημερώσεις - + &Controls &Χειριστήρια - + &Settings &Ρυθμίσεις - + &Help &Βοήθεια - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle Τυχαία σειρά - + Repeat Επανάληψη - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3324,308 +3329,178 @@ enter the displayed PIN number here: - - &Quit - &Έξοδος - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - &Συνδεθείτε - - - - Add &Friend... - Προσθήκη &Φίλου... - - - - U&pdate Collection - Ε&νημέρωση Συλλογής - - - - Update Collection - Ενημέρωση Συλλογής - - - - &Configure Tomahawk... - &Ρύθμιση Tomahawk... - - - - Load &XSPF... - Φόρτωση &XSPF... - - - - Create &New Playlist... - Δημιουργία &Νέας Λίστας Αναπαραγωγής - - - - About &Tomahawk... - Σχετικά με το &Tomahawk - - - - Create New &Automatic Playlist - Δημιουργία Νέας &Αυτόματης Λίστας Αναπαραγής - - - - Create New &Station - Δημιουργία Νέου &Σταθμού - - - - Show Offline Sources - Προβολή Πηγών Εκτός Σύνδεσης - - - - Hide Offline Sources - Απόκρυψη Πηγών Εκτός Σύνδεσης - - - - Minimize - Ελαχιστοποίηση - - - - Ctrl+M - Ctrl+M - - - - Zoom - Μεγέθυνση - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - - - - - Diagnostics... - Διαγνωστικά... - - - - Fully &Rescan Collection - Πλήρης &Επανασάρωση Συλλογής - - - - Fully Rescan Collection - Πλήρης Επανασάρωση Συλλογής - - - - Play - Αναπαραγωγή - - - - Space - Κενό - - - - Previous - Προηγούμενο - - - - Next - Επόμενο - - - + Back Πίσω - + Go back one page Πήγαινε πίσω μία σελίδα - + Forward Μπροστά - + Go forward one page Πήγαινε μπροστά μία σελίδα - - + + Hide Menu Bar Απόκρυψη Γραμμής Μενού - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer Σύνδεση Σε Ομότιμο Κόμβο - + Enter peer address: Εισαγωγή διεύθυνσης ομότιμου κόμβου: - + Enter peer port: Εισαγωγή θύρας ομότιμου κόμβου: - + Enter peer key: Εισαγωγή κλειδιού ομότιμου κόμβου: - + XSPF Error Σφάλμα XSPF - + This is not a valid XSPF playlist. Αυτή δεν είναι μια έγκυρη λίστα αναπαραγωγής XSPF. - + Failed to save tracks Αποτυχία αποθήκευσης κομματιών. - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Μερικά κομμάτια στην λίστα αναπαραγωγής δεν περιέχουν έναν καλλιτέχνη ή έναν τίτλο. Θα αγνοηθούν. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Συγγνώμη, υπάρχει ένα πρόβλημα πρόσβασης στην συσκευή ήχου ή στο επιθυμητό κομμάτι, το τρέχον κομμάτι θα παραλειφθεί. Σιγουρευτείτε ότι έχετε εγκαταστήσει ένα κατάλληλο Phonon backend και τα απαιτούμενα πρόσθετα. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Συγγνώμη, υπάρχει ένα πρόβλημα πρόσβασης στην συσκευή ήχου ή στο επιθυμητό κομμάτι, το τρέχον κομμάτι θα παραλειφθεί. - + Station Σταθμός - + Create New Station Δημιουργία Νέου Σταθμού - + Name: Όνομα: - + Playlist Λίστας Αναπαραγωγής - + Automatic Playlist Αυτόματη Λίστα Αναπαραγωγής - + Pause Παύση - + &Play - + Authentication Error Σφάλμα Πιστοποίησης - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name %1 από %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 - + Thanks to: Χάρη στους: - + About Tomahawk Σχετικά με το Tomahawk diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index 19301ea9f..dc443bbda 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -117,13 +117,13 @@ connect and stream from you? - + &Listen Privately &Listen Privately - + &Listen Publicly &Listen Publicly @@ -223,32 +223,37 @@ connect and stream from you? &Legal Information... - + + &View Logfile + &View Logfile + + + Check For Updates... Check For Updates... - + &Controls &Controls - + &Settings &Settings - + &Help &Help - + &Window &Window - + Main Menu Main Menu @@ -331,37 +336,37 @@ connect and stream from you? AudioControls - + Shuffle Shuffle - + Repeat Repeat - + Time Elapsed Time Elapsed - + Time Remaining Time Remaining - + Playing from %1 Playing from %1 - + Share Share - + Love Love @@ -1077,31 +1082,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you played %1 by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource played %1 by %2 - + added %1 e.g. added 3 hours ago added %1 - + by <b>%1</b> e.g. by SomeArtist by <b>%1</b> - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum by <b>%1</b> on <b>%2</b> @@ -3329,308 +3334,178 @@ enter the displayed PIN number here: Tomahawk - - &Quit - &Quit - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Go &Online - - - - Add &Friend... - Add &Friend... - - - - U&pdate Collection - U&pdate Collection - - - - Update Collection - Update Collection - - - - &Configure Tomahawk... - &Configure Tomahawk... - - - - Load &XSPF... - Load &XSPF... - - - - Create &New Playlist... - Create &New Playlist... - - - - About &Tomahawk... - About &Tomahawk... - - - - Create New &Automatic Playlist - Create New &Automatic Playlist - - - - Create New &Station - Create New &Station - - - - Show Offline Sources - Show Offline Sources - - - - Hide Offline Sources - Hide Offline Sources - - - - Minimize - Minimize - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zoom - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - &Legal Info... - - - - Diagnostics... - Diagnostics... - - - - Fully &Rescan Collection - Fully &Rescan Collection - - - - Fully Rescan Collection - Fully Rescan Collection - - - - Play - Play - - - - Space - Space - - - - Previous - Previous - - - - Next - Next - - - + Back Back - + Go back one page Go back one page - + Forward Forward - + Go forward one page Go forward one page - - + + Hide Menu Bar Hide Menu Bar - - + + Show Menu Bar Show Menu Bar - + Search for any artist, album or song... Search for any artist, album or song... - + &Main Menu &Main Menu - - - + + + Connect To Peer Connect To Peer - + Enter peer address: Enter peer address: - + Enter peer port: Enter peer port: - + Enter peer key: Enter peer key: - + XSPF Error XSPF Error - + This is not a valid XSPF playlist. This is not a valid XSPF playlist. - + Failed to save tracks Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + Station Station - + Create New Station Create New Station - + Name: Name: - + Playlist Playlist - + Automatic Playlist Automatic Playlist - + Pause Pause - + &Play &Play - + Authentication Error Authentication Error - + Error connecting to SIP: Authentication failed! Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name %1 by %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010 - 2012 - + Thanks to: Thanks to: - + About Tomahawk About Tomahawk diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts index 40eb9e4ae..706fa3e3a 100644 --- a/lang/tomahawk_es.ts +++ b/lang/tomahawk_es.ts @@ -117,13 +117,13 @@ conectarse a usted y transmitir música? - + &Listen Privately &Modo privado - + &Listen Publicly &Escuchar públicamente @@ -223,32 +223,37 @@ conectarse a usted y transmitir música? Información &legal - + + &View Logfile + + + + Check For Updates... Buscar actualizaciones... - + &Controls &Controles - + &Settings &Configuración - + &Help &Ayuda - + &Window &Ventana - + Main Menu Menú principal @@ -331,37 +336,37 @@ conectarse a usted y transmitir música? AudioControls - + Shuffle Aleatorio - + Repeat Repetir - + Time Elapsed Tiempo transcurrido - + Time Remaining Tiempo restante - + Playing from %1 Reproduciendo de %1 - + Share Compartir - + Love Favorito @@ -1077,31 +1082,31 @@ conectarse a usted y transmitir música? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3329,308 +3334,178 @@ introduzca su número PIN aquí: Tomahawk - - &Quit - &Salir - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - &Conectarse - - - - Add &Friend... - Añadir &amigo... - - - - U&pdate Collection - A&ctualizar colección - - - - Update Collection - Actualizar colección - - - - &Configure Tomahawk... - &Configurar Tomahawk... - - - - Load &XSPF... - Cargar &XSPF... - - - - Create &New Playlist... - Crear una &nueva lista de reproducción... - - - - About &Tomahawk... - Acerca de &Tomahawk... - - - - Create New &Automatic Playlist - Crear nueva &lista de reproducción automática - - - - Create New &Station - Crear nueva &estación - - - - Show Offline Sources - Mostrar fuentes fuera de línea - - - - Hide Offline Sources - Ocultar fuentes fuera de línea - - - - Minimize - Minimizar - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zoom - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - Información &legal... - - - - Diagnostics... - Diagnósticos... - - - - Fully &Rescan Collection - &Re-escanear completamente la colección - - - - Fully Rescan Collection - Re-escanear completamente la colección - - - - Play - Reproducir - - - - Space - Espacio - - - - Previous - Anterior - - - - Next - Siguiente - - - + Back Atrás - + Go back one page Ir atrás una página - + Forward Adelante - + Go forward one page Ir adelante una página - - + + Hide Menu Bar Esconder barra de menú - - + + Show Menu Bar Mostrar barra de menú - + Search for any artist, album or song... Buscar un artista, álbum o pista... - + &Main Menu &Menú principal - - - + + + Connect To Peer Conectar a un par - + Enter peer address: Introducir dirección del par: - + Enter peer port: Introducir puerto del par: - + Enter peer key: Introducir contraseña del par: - + XSPF Error Error XSPF - + This is not a valid XSPF playlist. Esta no es una lista de reproducción XSPF válida. - + Failed to save tracks Fallo al guardar pistas - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Algunas pistas en la lista de reproducción no contienen artista ni título. Serán ignoradas. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Se ha producido un error al acceder al dispostivo de audio o a la pista deseada. Asegúrese de que ha instalado un backend de Phonon adecuado y los plugins necesarios. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Se ha producido un error al acceder al dispostivo de audio o a la pista deseado y se va saltar. - + Station Nueva estación - + Create New Station Crear nueva estación - + Name: Nombre: - + Playlist Lista de reproducción - + Automatic Playlist Lista de reproducción automática - + Pause Pausar - + &Play &Reproducir - + Authentication Error Error de autenticación - + Error connecting to SIP: Authentication failed! Error conectando al SIP: ¡Autenticación fallida! - + %1 by %2 track, artist name %1 por %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010-2012 - + Thanks to: Gracias a: - + About Tomahawk Acerca de Tomahawk diff --git a/lang/tomahawk_fi.ts b/lang/tomahawk_fi.ts index b963927a5..79767f313 100644 --- a/lang/tomahawk_fi.ts +++ b/lang/tomahawk_fi.ts @@ -117,13 +117,13 @@ yhdistää ja toistaa sinulta virtaa? - + &Listen Privately &Kuuntele yksityisesti - + &Listen Publicly &Kuuntele julkisesti @@ -223,32 +223,37 @@ yhdistää ja toistaa sinulta virtaa? Lakitiet&oa... - + + &View Logfile + + + + Check For Updates... Tarkista päivitykset... - + &Controls &Ohjaus - + &Settings &Asetukset - + &Help O&hje - + &Window &Ikkuna - + Main Menu Päävalikko @@ -331,37 +336,37 @@ yhdistää ja toistaa sinulta virtaa? AudioControls - + Shuffle Sekoita - + Repeat Toista - + Time Elapsed Kulunut aika - + Time Remaining Jäljellä oleva aika - + Playing from %1 Soitetaan lähteestä %1 - + Share Jaa - + Love Tykkää @@ -1077,31 +1082,31 @@ yhdistää ja toistaa sinulta virtaa? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you kuuntelit %1 - + played %1 by %2 e.g. played 3 hours ago by SomeSource %2 kuunteli %1 - + added %1 e.g. added 3 hours ago lisätty %1 - + by <b>%1</b> e.g. by SomeArtist artistilta <b>%1</b> - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum artistilta <b>%1</b> albumilla <b>%2</b> @@ -3332,308 +3337,178 @@ anna siellä näytetty PIN-koodi tähän: Tomahawk - - &Quit - &Lopeta - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Mene &verkkoon - - - - Add &Friend... - Lisää &kaveri... - - - - U&pdate Collection - P&äivitä kokoelma - - - - Update Collection - Päivitä kokoelma - - - - &Configure Tomahawk... - Tomahawkin &asetukset... - - - - Load &XSPF... - Lataa &XSPF... - - - - Create &New Playlist... - Luo &uusi soittolista... - - - - About &Tomahawk... - &Tietoa Tomahawkista... - - - - Create New &Automatic Playlist - Luo uusi &automaattinen soittolista - - - - Create New &Station - Luo uusi a&sema - - - - Show Offline Sources - Näytä verkottomat lähteet - - - - Hide Offline Sources - Piilota verkottomat lähteet - - - - Minimize - Pienennä - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zoomaa - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - Lakitiet&oa... - - - - Diagnostics... - Diagnostiikka... - - - - Fully &Rescan Collection - &Muodosta kokoelma alusta alkaen - - - - Fully Rescan Collection - Muodosta kokoelma alusta alkaen - - - - Play - Soita - - - - Space - Space - - - - Previous - Edellinen - - - - Next - Seuraava - - - + Back Takaisin - + Go back one page Mene yksi sivu takaisin - + Forward Eteenpäin - + Go forward one page Mene yksi sivu eteenpäin - - + + Hide Menu Bar Piilota valikkorivi - - + + Show Menu Bar Näytä valikkorivi - + Search for any artist, album or song... Etsi mitä tahansa artistia, albumia tai kappaletta... - + &Main Menu &Päävalikko - - - + + + Connect To Peer Yhdistä vertaiseen - + Enter peer address: Anna vertaisen osoite: - + Enter peer port: Anna vertaisen portti: - + Enter peer key: Anna vertaisen avain: - + XSPF Error XSPF-virhe - + This is not a valid XSPF playlist. Tämä ei ole kelvollinen XSPF-soittolista. - + Failed to save tracks Kappaleiden tallentaminen epäonnistui - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Joillakin soittolistan kappaleilla ei ole artistia ja nimeä. Ne jätetään huomiotta. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Valitettavasti äänilaitteen tai halutun kappaleen kanssa on ongelmia ja nykyinen kappale ohitetaan. Varmista, että sopiva Phononin taustaosa ja vaaditut liitännäiset on asennettu. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Valitettavasti äänilaitteen tai halutun kappaleen kanssa on ongelmia ja nykyinen kappale ohitetaan. - + Station Asema - + Create New Station Luo uusi asema - + Name: Nimi: - + Playlist Soittolista - + Automatic Playlist Automaattinen soittolista - + Pause Tauko - + &Play &Soita - + Authentication Error Tunnistautumisvirhe - + Error connecting to SIP: Authentication failed! Virhe yhdistettäessä SIPiin: tunnistautuminen epäonnistui! - + %1 by %2 track, artist name %1 artistilta %2 - + %1 - %2 current track, some window title %1 – %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010–2012 - + Thanks to: Kiitokset: - + About Tomahawk Tietoa Tomahawkista diff --git a/lang/tomahawk_fr.ts b/lang/tomahawk_fr.ts index bc9575638..e97303bc3 100644 --- a/lang/tomahawk_fr.ts +++ b/lang/tomahawk_fr.ts @@ -117,13 +117,13 @@ de se connecter et streamer de vous? - + &Listen Privately &Ecouter en privé - + &Listen Publicly &Ecouter publiquement @@ -223,32 +223,37 @@ de se connecter et streamer de vous? &Informations Légales... - + + &View Logfile + + + + Check For Updates... Rechercher une mis à jour... - + &Controls &Contrôles - + &Settings &Paramètres - + &Help &Aide - + &Window &Fenêtre - + Main Menu Menu Principal @@ -331,37 +336,37 @@ de se connecter et streamer de vous? AudioControls - + Shuffle Lecture Aléatoire - + Repeat Répéter - + Time Elapsed Durée Ecoulé - + Time Remaining Durée Restante - + Playing from %1 - + Share Partager - + Love Favori @@ -1077,31 +1082,31 @@ de se connecter et streamer de vous? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3326,308 +3331,178 @@ saisissez le numéro PIN ici : Tomahawk - - &Quit - &Quitter - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Se c&onnecter - - - - Add &Friend... - Ajouter un &ami... - - - - U&pdate Collection - Mettre à Jo&ur la Collection - - - - Update Collection - Mettre à Jour la Collection - - - - &Configure Tomahawk... - &Configurer Tomahawk... - - - - Load &XSPF... - Charger &XSPF... - - - - Create &New Playlist... - Créer une &nouvelle liste de lecture... - - - - About &Tomahawk... - A propos de &Tomahawk... - - - - Create New &Automatic Playlist - Créer une nouvelle liste de lecture &automatique - - - - Create New &Station - Créer une nouvelle &Station - - - - Show Offline Sources - Afficher les sources hors ligne - - - - Hide Offline Sources - Masquer les sources hors ligne - - - - Minimize - Réduire - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zoom - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - &Informations Légales... - - - - Diagnostics... - Diagnostics... - - - - Fully &Rescan Collection - &Rescanner la collection entièrement - - - - Fully Rescan Collection - Rescanner la collection entièrement - - - - Play - Lecture - - - - Space - Espace - - - - Previous - Précédent - - - - Next - Suivant - - - + Back Retour - + Go back one page Reculer d'une page - + Forward Avancer - + Go forward one page Avancer d'une page - - + + Hide Menu Bar Masquer la barre de menu - - + + Show Menu Bar Afficher la barre de menu - + Search for any artist, album or song... Chercher un artiste, un album, ou un morceau - + &Main Menu &Menu Principal - - - + + + Connect To Peer Connexion à un pair - + Enter peer address: Adresse du pair : - + Enter peer port: Port du pair : - + Enter peer key: Clé du pair : - + XSPF Error Erreur XSPF - + This is not a valid XSPF playlist. Ceci n'est pas une liste de lecture XSPF valide. - + Failed to save tracks Échec de la sauvegarde des pistes - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Certaines pistes dans la liste de lecture ne contiennent pas d'artiste ou de titre. Elles seront ignorées. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Désolé, il y a un problème d'accès à votre matériel audio ou la piste en cours va être sautée. Vérifiez que vous avez un backend Phonon et les plugins requis installés. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Désolé, il y a un problème d'accès à votre matériel audio ou la piste en cours , celle-ci va être sautée. - + Station Station - + Create New Station Créer une nouvelle station - + Name: Nom : - + Playlist Liste de lecture - + Automatic Playlist Liste de lecture automatique - + Pause Pause - + &Play &Lire - + Authentication Error Erreur d'authentification - + Error connecting to SIP: Authentication failed! Erreur de connexion SIP : échec de l'authentification ! - + %1 by %2 track, artist name %1 par %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Droit d'auteur 2010 - 2012 - + Thanks to: Merci a: - + About Tomahawk A propos de Tomahawk diff --git a/lang/tomahawk_gl.ts b/lang/tomahawk_gl.ts index d37c1bf8c..20d3add40 100644 --- a/lang/tomahawk_gl.ts +++ b/lang/tomahawk_gl.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately &Escoitar en privado - + &Listen Publicly &Escoutar en público @@ -222,32 +222,37 @@ connect and stream from you? &Información legal... - + + &View Logfile + + + + Check For Updates... Buscar actualizacións... - + &Controls &Controis - + &Settings &Configuración - + &Help &Axuda - + &Window &Xanela - + Main Menu Menú principal @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle Ao chou - + Repeat Repetir - + Time Elapsed Tempo transcorrido - + Time Remaining Tempo que falta - + Playing from %1 Reproducindo de %1 - + Share Compartir - + Love gusta @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3326,309 +3331,179 @@ enter the displayed PIN number here: Tomahawk - - &Quit - &Saír - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Pórse en &liña - - - - Add &Friend... - Engadir a un &amigo... - - - - U&pdate Collection - &Actualizar a colección - - - - Update Collection - Actualizar a colección - - - - &Configure Tomahawk... - &Configurar Tomahawk... - - - - Load &XSPF... - Cargar &XSPF... - - - - Create &New Playlist... - Crear unha &lista de temas nova... - - - - About &Tomahawk... - Acerca de &Tomahawk... - - - - Create New &Automatic Playlist - Crear unha nova lista de reproducción &automática - - - - Create New &Station - Crear unha nova &emisora - - - - Show Offline Sources - Mostrar as fontes fóra de liña - - - - Hide Offline Sources - Agochar as fontes fóra de liña - - - - Minimize - Minimizar - - - - Ctrl+M - Ctrl+M - - - - Zoom - Ampliación - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - Información &legal... - - - - Diagnostics... - Diagnóstico... - - - - Fully &Rescan Collection - Rescanear a colección ao &completo - - - - Fully Rescan Collection - Rescanear a colección ao completo - - - - Play - Reproducir - - - - Space - Espazo - - - - Previous - Anterior - - - - Next - Seguinte - - - + Back Atrás - + Go back one page Ir unha páxina atrás - + Forward Adiante - + Go forward one page Ir unha páxian adiante - - + + Hide Menu Bar Agochar a barra de menú - - + + Show Menu Bar Mostrar a barra de menú - + Search for any artist, album or song... - + &Main Menu Menú &principal - - - + + + Connect To Peer Conectar cun parceiro - + Enter peer address: Introducir a dirección do parceiro: - + Enter peer port: Introducir o porto do parceiro: - + Enter peer key: Introducir a clave do parceiro: - + XSPF Error Erro XSPF - + This is not a valid XSPF playlist. Esta non é unha lista de XSPF válida. - + Failed to save tracks Fallou o gardado de pistas - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Algunhas pistas na lista de reprodución non indican nin artista nin o título. Ignoraranse. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Hai un problema accedendo ao teu dispositivo de son ou a pista que quere así que se omitirá. Asegúrate de ter o motor Phonon e os engadidos necesarios instalados. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Hai un problema accedendo ao teu dispositivo de son ou a pista que quere así que se omitirá. - + Station - + Create New Station Crear unha nova emisión - + Name: Nome: - + Playlist Lista de reprodución - + Automatic Playlist Lista de reprodución automática - + Pause Pausa - + &Play &Reproducir - + Authentication Error Erro de autenticación - + Error connecting to SIP: Authentication failed! Erro conectándose a SIP: Fallou a autentificación! - + %1 by %2 track, artist name %1 por %2 - + %1 - %2 current track, some window title %1.- %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010 - 2012 - + Thanks to: Agradecementos: - + About Tomahawk Acerca de Tomahawk diff --git a/lang/tomahawk_hi_IN.ts b/lang/tomahawk_hi_IN.ts index ed9aada7c..e06b43fbb 100644 --- a/lang/tomahawk_hi_IN.ts +++ b/lang/tomahawk_hi_IN.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately - + &Listen Publicly @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle - + Repeat - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3316,308 +3321,178 @@ enter the displayed PIN number here: - - &Quit - - - - - Ctrl+Q - - - - - Go &Online - - - - - Add &Friend... - - - - - U&pdate Collection - - - - - Update Collection - - - - - &Configure Tomahawk... - - - - - Load &XSPF... - - - - - Create &New Playlist... - - - - - About &Tomahawk... - - - - - Create New &Automatic Playlist - - - - - Create New &Station - - - - - Show Offline Sources - - - - - Hide Offline Sources - - - - - Minimize - - - - - Ctrl+M - - - - - Zoom - - - - - Meta+Ctrl+Z - - - - - &Legal Info... - - - - - Diagnostics... - - - - - Fully &Rescan Collection - - - - - Fully Rescan Collection - - - - - Play - - - - - Space - - - - - Previous - - - - - Next - - - - + Back - + Go back one page - + Forward - + Go forward one page - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer - + Enter peer address: - + Enter peer port: - + Enter peer key: - + XSPF Error - + This is not a valid XSPF playlist. - + Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + Station - + Create New Station - + Name: - + Playlist - + Automatic Playlist - + Pause - + &Play - + Authentication Error - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name - + %1 - %2 current track, some window title - + <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 - + Thanks to: - + About Tomahawk diff --git a/lang/tomahawk_hu.ts b/lang/tomahawk_hu.ts index 7d5f8199e..b661f3bcb 100644 --- a/lang/tomahawk_hu.ts +++ b/lang/tomahawk_hu.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately - + &Listen Publicly @@ -222,32 +222,37 @@ connect and stream from you? Jogi információk - + + &View Logfile + + + + Check For Updates... Frissítések ellenőrzése - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle - + Repeat Ismétlés - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3316,308 +3321,178 @@ enter the displayed PIN number here: Tomahawk - - &Quit - Kiléps - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - - - - - Add &Friend... - Barát hozzáadása - - - - U&pdate Collection - Kollekció frissítése - - - - Update Collection - Kollekció frissítése - - - - &Configure Tomahawk... - Tomahawk beállítása - - - - Load &XSPF... - &XSPF betöltése... - - - - Create &New Playlist... - Új lejátszólista létrehozása - - - - About &Tomahawk... - &Tomahawkról - - - - Create New &Automatic Playlist - - - - - Create New &Station - - - - - Show Offline Sources - Nem elérhető források mutatása - - - - Hide Offline Sources - Nem elérhető források elrejtése - - - - Minimize - Minimalizálás - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zoom - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - - - - - Diagnostics... - Diagnosztizálás... - - - - Fully &Rescan Collection - - - - - Fully Rescan Collection - - - - - Play - Lejátszás - - - - Space - Szóköz - - - - Previous - Előző - - - - Next - Következő - - - + Back - + Go back one page - + Forward - + Go forward one page - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer - + Enter peer address: - + Enter peer port: - + Enter peer key: - + XSPF Error XSPF hiba - + This is not a valid XSPF playlist. Nem érvényes XSPF lejátszólista. - + Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + Station Rádióállomás - + Create New Station - + Name: - + Playlist Lejátszólista - + Automatic Playlist Automatikus lejátszólista - + Pause - + &Play - + Authentication Error - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name - + %1 - %2 current track, some window title - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 - + Thanks to: - + About Tomahawk Tomahawkról diff --git a/lang/tomahawk_it.ts b/lang/tomahawk_it.ts index 2c318a487..ba7facd29 100644 --- a/lang/tomahawk_it.ts +++ b/lang/tomahawk_it.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately &Ascolta in privato - + &Listen Publicly &Ascolta pubblicamente @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle Riproduzione casuale - + Repeat Ripeti - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3316,308 +3321,178 @@ enter the displayed PIN number here: Tomahawk - - &Quit - &Spegni - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Connettiti &online - - - - Add &Friend... - Aggiungi un &amico... - - - - U&pdate Collection - Aggiorna collezione - - - - Update Collection - Aggiorna collezione - - - - &Configure Tomahawk... - &Configura Tomahawk... - - - - Load &XSPF... - Carica &XSPF... - - - - Create &New Playlist... - Crea una &nuova playlist... - - - - About &Tomahawk... - Info su &Tomahawk - - - - Create New &Automatic Playlist - Crea una nuova playlist &automatica - - - - Create New &Station - Crea una nuova &stazione - - - - Show Offline Sources - Mostra risorse non connesse - - - - Hide Offline Sources - Nascondi risorse non connesse - - - - Minimize - Minimizza - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zomma - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - Informazioni &legali... - - - - Diagnostics... - Diagnostica... - - - - Fully &Rescan Collection - Nuova &scansione della collezione - - - - Fully Rescan Collection - Nuova scansione della collezione - - - - Play - Play - - - - Space - Spazio - - - - Previous - Precedente - - - - Next - Prossima - - - + Back Indietro - + Go back one page Vai indietro di una pagina - + Forward Avanti - + Go forward one page Vai avanti di una pagina - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer Connettiti al peer - + Enter peer address: Inserisci indirizzo peer: - + Enter peer port: Inserisci porta peer: - + Enter peer key: Inserisce chiave peer: - + XSPF Error Errore XSPF - + This is not a valid XSPF playlist. Questa non è una valida playlist XSPF. - + Failed to save tracks Errore nel salvare le tracce - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Alcune tracce nella playlist non contengono l'artista e il titolo. Verrano ignorate. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Spiacente, c'è un problema nell'accedere al tuo dispositivo audio o alla traccia desiderata, questa traccia verrà saltata. Assicurati di avere le giuste librerie Phonon e i plugin necessari installati. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Spiacente, c'è un problema nell'accedere al tuo dispositivo audio o alla traccia desiderata, questa traccia verrà saltata. - + Station Stazione - + Create New Station Crea una nuova stazione - + Name: Nome: - + Playlist Playlist - + Automatic Playlist Playlist automatica - + Pause Pausa - + &Play - + Authentication Error Errore nell'autenticazione - + Error connecting to SIP: Authentication failed! Errore di connessione al SIP: autenticazione fallita! - + %1 by %2 track, artist name %1 di %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010 - 2012 - + Thanks to: Grazie a: - + About Tomahawk Info su Tomahawk diff --git a/lang/tomahawk_ja.ts b/lang/tomahawk_ja.ts index f7bb65c9e..83f37e51a 100644 --- a/lang/tomahawk_ja.ts +++ b/lang/tomahawk_ja.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately 非公開で聴く - + &Listen Publicly 公開で聴く @@ -222,32 +222,37 @@ connect and stream from you? 法定情報... - + + &View Logfile + + + + Check For Updates... 更新を確認... - + &Controls 制御 - + &Settings 設定 - + &Help ヘルプ - + &Window ウインドウ - + Main Menu メインメニュー @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle シャッフル - + Repeat リピート - + Time Elapsed 再生時間 - + Time Remaining 残り時間 - + Playing from %1 %1から再生中 - + Share シェアー - + Love Love @@ -1077,31 +1082,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you %1を再生しました。 - + played %1 by %2 e.g. played 3 hours ago by SomeSource %2が%1を再生しました。 - + added %1 e.g. added 3 hours ago %1を追加しました - + by <b>%1</b> e.g. by SomeArtist <b>%1</b> - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum <b>%1</b>の<b>%2</b> @@ -3329,309 +3334,178 @@ enter the displayed PIN number here: Tomahawk - - &Quit - 終了 - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - オンライン化する - - - - Add &Friend... - 友達を追加... - - - - U&pdate Collection - コレクションを更新 - - - - Update Collection - コレクションを更新 - - - - &Configure Tomahawk... - Tomahawkを設定... - - - - Load &XSPF... - XSPFを読み込み... - - - - Create &New Playlist... - 新規プレイリストを作成... - - - - About &Tomahawk... - Tomahawk について... - - - - Create New &Automatic Playlist - 新規自動でプレイリストを作成する - - - - Create New &Station - 新規ステーションを作成 - - - - Show Offline Sources - オフラインのソースを表示 - - - - Hide Offline Sources - オフラインのソースを隠す - - - - Minimize - 最小化 - - - - Ctrl+M - Ctrl+M - - - - Zoom - ズーム - - - - Meta+Ctrl+Z - -Meta+Ctrl+Z - - - - &Legal Info... - 法定情報... - - - - Diagnostics... - 診断... - - - - Fully &Rescan Collection - すべてのコレクションを再スキャンする - - - - Fully Rescan Collection - すべてのコレクションを再スキャンする - - - - Play - 再生 - - - - Space - スペース - - - - Previous - 前へ - - - - Next - 次へ - - - + Back プレイリスト - + Go back one page 前のページ - + Forward 次へ - + Go forward one page 次のページ - - + + Hide Menu Bar メニューバーを隠す - - + + Show Menu Bar メニューバーを表示 - + Search for any artist, album or song... アーティスト、又はアルバムや曲で検索して下さい - + &Main Menu メインメニュー - - - + + + Connect To Peer ピアに接続する - + Enter peer address: ピアのアドレスを入力: - + Enter peer port: ピアのポートを入力: - + Enter peer key: ピアのキーを入力: - + XSPF Error XSPFエラー - + This is not a valid XSPF playlist. このプレイリストは有利なXSPFプレイリストではありません。 - + Failed to save tracks トラックの保存に失敗しました。 - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. プレイリストにアーティストもタイトルの無いトラックが見つかりました。この項目は無視されます。 - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. オーディオデバイス、又は要求トラックをアクセスすることができませんでしたので、このトラックは無視されます。適しているPhononのバックエンドを確認の上、必須プラグインのインストールを確認して下さい。 - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. オーディオデバイス、又は要求トラックをアクセスすることができませんでしたので、このトラックは無視されます。 - + Station ステーション - + Create New Station 新規ステーションを作成 - + Name: 名前: - + Playlist プレイリスト - + Automatic Playlist 自動プレイリスト - + Pause 一時停止 - + &Play 再生 - + Authentication Error 認証エラー - + Error connecting to SIP: Authentication failed! SIPへの接続エラー: 認証が失敗しました！ - + %1 by %2 track, artist name %1 by %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010 - 2012 - + Thanks to: Thanks to: - + About Tomahawk Tomahawkについて diff --git a/lang/tomahawk_lt.ts b/lang/tomahawk_lt.ts index cd4eb895c..a0c3fae3d 100644 --- a/lang/tomahawk_lt.ts +++ b/lang/tomahawk_lt.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately K&lausytis privačiai - + &Listen Publicly K&lausytis viešai @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle Maišyti - + Repeat Kartoti - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3316,308 +3321,178 @@ enter the displayed PIN number here: Tomahawk - - &Quit - &Baigti darbą - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Prisi&jungti - - - - Add &Friend... - Pridėti &draugą... - - - - U&pdate Collection - At&naujinti kolekciją - - - - Update Collection - Atnaujinti kolekciją - - - - &Configure Tomahawk... - &Konfigūruoti Tomahawk... - - - - Load &XSPF... - Įkelti &XSPF... - - - - Create &New Playlist... - Sukurti naują &grojaraštį - - - - About &Tomahawk... - Apie &Tomahawk... - - - - Create New &Automatic Playlist - Sukurti naują &automatinį grojaraštį - - - - Create New &Station - Sukurti naują &stotį - - - - Show Offline Sources - - - - - Hide Offline Sources - - - - - Minimize - Sumažinti - - - - Ctrl+M - Ctrl+M - - - - Zoom - - - - - Meta+Ctrl+Z - - - - - &Legal Info... - &Teisinė informacija... - - - - Diagnostics... - Diagnostika... - - - - Fully &Rescan Collection - Pilnai pe&ržvelgti kolekciją - - - - Fully Rescan Collection - Pilnai peržvelgti kolekciją - - - - Play - Groti - - - - Space - Tarpas - - - - Previous - Ankstesnis - - - - Next - Kitas - - - + Back Atgal - + Go back one page Grįžti vienu puslapiu atgal - + Forward Pirmyn - + Go forward one page Eiti vienu puslapiu pirmyn - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer - + Enter peer address: - + Enter peer port: - + Enter peer key: - + XSPF Error XSPF klaida - + This is not a valid XSPF playlist. - + Failed to save tracks Nepavyko išsaugoti takelių - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + Station Stotis - + Create New Station Sukurti naują stotį - + Name: Pavadinimas: - + Playlist Grojaraštis - + Automatic Playlist Automatinis grojaraštis - + Pause Pristabdyti - + &Play - + Authentication Error - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name - + %1 - %2 current track, some window title - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Autorinės teisės 2010 - 2012 - + Thanks to: Dėkojame: - + About Tomahawk Apie Tomahawk diff --git a/lang/tomahawk_pl.ts b/lang/tomahawk_pl.ts index c7a0ad6ea..a2d5d04a8 100644 --- a/lang/tomahawk_pl.ts +++ b/lang/tomahawk_pl.ts @@ -117,13 +117,13 @@ połączyć się i strumieniować od ciebie? - + &Listen Privately &Słuchaj Prywatnie - + &Listen Publicly &Słuchaj Publicznie @@ -223,32 +223,37 @@ połączyć się i strumieniować od ciebie? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -331,37 +336,37 @@ połączyć się i strumieniować od ciebie? AudioControls - + Shuffle Losowo - + Repeat Powtarzaj - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love Lubię @@ -1077,31 +1082,31 @@ połączyć się i strumieniować od ciebie? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3326,308 +3331,178 @@ wprowadź pokazany numer PIN tutaj: Tomahawk - - &Quit - &Zakończ - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Przejdź do trybu &Online - - - - Add &Friend... - Dodaj &Znajomego... - - - - U&pdate Collection - U&aktualnij Kolekcję - - - - Update Collection - Uaktualnij Kolekcję - - - - &Configure Tomahawk... - &Konfiguruj Tomahawk... - - - - Load &XSPF... - Załaduj &XSPF... - - - - Create &New Playlist... - Utwórz &Nową Listę... - - - - About &Tomahawk... - O &Tomahawk... - - - - Create New &Automatic Playlist - Utwórz Nową &Automatyczną Listę - - - - Create New &Station - Utwórz Nową &Stację - - - - Show Offline Sources - Pokaż Źródła Offline - - - - Hide Offline Sources - Ukryj Źródła Offline - - - - Minimize - Minimalizuj - - - - Ctrl+M - Ctrl+M - - - - Zoom - Powiększenie - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - Informacje prawne (&L) - - - - Diagnostics... - Diagnostyka... - - - - Fully &Rescan Collection - Kompletnie &Przeskanuj Kolekcję - - - - Fully Rescan Collection - Kompletnie Przeskanuj Kolekcję - - - - Play - Odtwarzaj - - - - Space - Spacja - - - - Previous - Poprzedni - - - - Next - Następny - - - + Back Wstecz - + Go back one page Cofnij o jedną stronę - + Forward Naprzód - + Go forward one page Przejdź naprzód o jedną stronę - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer - + Enter peer address: - + Enter peer port: - + Enter peer key: - + XSPF Error Błąd XSPF - + This is not a valid XSPF playlist. To nie jest poprawna lista XSPF. - + Failed to save tracks Nie udało się zapisać utworów - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Niektóre utwory na liście nie zawierają artysty i tytułu. Zostaną one zignorowane. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Przepraszamy, wystąpił problem z połączeniem z twoim urządzeniem audio lub z żądanym utworem, zostanie on pominięty. - + Station - + Create New Station Utwórz Nową Stację - + Name: Nazwa: - + Playlist - + Automatic Playlist - + Pause Pauza - + &Play - + Authentication Error Błąd uwierzytelniania - + Error connecting to SIP: Authentication failed! Błąd łączenia z SIP: Uwierzytelnienie nieudane! - + %1 by %2 track, artist name %1 wykonawcy %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010 - 2012 - + Thanks to: Podziękowania dla: - + About Tomahawk O Tomahawku diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts index 6dd7488c0..30d2dadad 100644 --- a/lang/tomahawk_pt_BR.ts +++ b/lang/tomahawk_pt_BR.ts @@ -117,13 +117,13 @@ se conecte e faça o stream de você? - + &Listen Privately &Ouvir Privadamente - + &Listen Publicly &Ouvir Publicamente @@ -223,32 +223,37 @@ se conecte e faça o stream de você? Informação &legal... - + + &View Logfile + + + + Check For Updates... Verificar atualizações... - + &Controls &Controles - + &Settings C&onfigurações - + &Help &Ajuda - + &Window &Janela - + Main Menu Menu principal @@ -331,37 +336,37 @@ se conecte e faça o stream de você? AudioControls - + Shuffle Shuffle - + Repeat Repetir - + Time Elapsed Tempo decorrido - + Time Remaining Tempo restante - + Playing from %1 Reproduzindo de %1 - + Share Compartilhar - + Love Gostar @@ -1077,31 +1082,31 @@ se conecte e faça o stream de você? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist por <b>%1</b> - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum por <b>%1</b> em <b>%2</b> @@ -3326,308 +3331,178 @@ colocar o número PIN mostrado aqui: Tomahawk - - &Quit - &Sair - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Co&nectar - - - - Add &Friend... - Adicionar A&migo... - - - - U&pdate Collection - A&tualizar biblioteca - - - - Update Collection - Atualizar biblioteca - - - - &Configure Tomahawk... - Configurar To&mahawk... - - - - Load &XSPF... - Abrir &XSPF... - - - - Create &New Playlist... - Criar nova &lista de reprodução... - - - - About &Tomahawk... - Sobre Tomaha&wk... - - - - Create New &Automatic Playlist - Criar no&va lista Automática - - - - Create New &Station - Criar n&ova estação - - - - Show Offline Sources - Mostrar origens desconectadas - - - - Hide Offline Sources - Ocultar origens desconectadas - - - - Minimize - Minimizar - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zoom - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - &Informação Legal - - - - Diagnostics... - Diagnósticos... - - - - Fully &Rescan Collection - Escanear &toda a biblioteca - - - - Fully Rescan Collection - Escanear toda biblioteca novamente - - - - Play - Reporduzir - - - - Space - Espaço - - - - Previous - Anterior - - - - Next - Próximo - - - + Back Voltar - + Go back one page Voltar uma página - + Forward Avançar - + Go forward one page Avançar uma página - - + + Hide Menu Bar Esconder barra de menu - - + + Show Menu Bar Mostrar barra de menu - + Search for any artist, album or song... Pesquisar por qualquer artista, álbum ou música... - + &Main Menu &Menu principal - - - + + + Connect To Peer Conectar-se ao par - + Enter peer address: Coloque o endereço do par: - + Enter peer port: Coloque a porta do par: - + Enter peer key: Coloque a chave do par: - + XSPF Error Erro de XSPF - + This is not a valid XSPF playlist. Esta não é uma lista de reprodução XSPF válida. - + Failed to save tracks Falha ao salvar faixas - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Algumas faixas da lista de reprodução não contem artista e título. Estas serão ignoradas. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. Desculpe, há um problema ao acessar sua placa de áudio ou a faixa desejada, a faixa atual será ignorada. Certifique-se de ter um backend do Phonon adequado e os plugins necessários instalados. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Desculpe, há um problema ao acessar sua placa de áudio ou a faixa desejada, a faixa atual será ignorada. - + Station Estação - + Create New Station Criar uma nova estação - + Name: Nome: - + Playlist Playlist - + Automatic Playlist Playlist Automática - + Pause PIN do Twitter - + &Play Re&produzir - + Authentication Error Erro de autenticação - + Error connecting to SIP: Authentication failed! Erro ao conectar ao SIP: Falha de autenticação! - + %1 by %2 track, artist name %1 de %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Copyright 2010 - 2012 - + Thanks to: Agradecimentos: - + About Tomahawk Sobre o Tomahawk diff --git a/lang/tomahawk_ru.ts b/lang/tomahawk_ru.ts index a412db065..2a72f6082 100644 --- a/lang/tomahawk_ru.ts +++ b/lang/tomahawk_ru.ts @@ -74,12 +74,12 @@ connect and stream from you? Connect &All - Соединиться со Всеми + Включить Все Disconnect &All - Отключиться от Всех + Выключить Всё @@ -118,13 +118,13 @@ connect and stream from you? - + &Listen Privately &Слушать Cамому - + &Listen Publicly &Слушать со всеми @@ -209,7 +209,7 @@ connect and stream from you? Hide Menu Bar - + Спрятать строку меню приложения @@ -227,32 +227,37 @@ connect and stream from you? &Юридическая информация - + + &View Logfile + &Показать Логи + + + Check For Updates... Проверить обновление... - + &Controls &Управление - + &Settings &Настройки - + &Help &Помощь - + &Window &Окно - + Main Menu Главное меню @@ -335,37 +340,37 @@ connect and stream from you? AudioControls - + Shuffle Случаная - + Repeat Повторять - + Time Elapsed Прошедшее время - + Time Remaining Оставшееся время - + Playing from %1 Воспроизводит из %1 - + Share Поделиться - + Love Любимый @@ -375,17 +380,17 @@ connect and stream from you? Sorry, Tomahawk couldn't find the track '%1' by %2 - К сожалению, Tomahawk не мог найти песню '%1' %2 + К сожалению, Tomahawk не смог найти песню '%1' %2 Sorry, Tomahawk couldn't find the artist '%1' - К сожалению, Tomahawk не мог найти исполнителя '%1' + К сожалению, Tomahawk не смог найти исполнителя '%1' Sorry, Tomahawk couldn't find the album '%1' by %2 - К сожалению, Tomahawk не мог найти альбом '%1' %2 + К сожалению, Tomahawk не смог найти альбом '%1' %2 @@ -551,7 +556,7 @@ connect and stream from you? Steer this station: - + Управлять этой станцией: @@ -571,7 +576,7 @@ connect and stream from you? Keep at current - + Оставить на текущей @@ -1041,7 +1046,7 @@ connect and stream from you? Vague match - + Расплывчатое совпадение @@ -1081,34 +1086,34 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you Воспроизводилась %1 вами - + played %1 by %2 e.g. played 3 hours ago by SomeSource Воспроизводилась %1 %2 - + added %1 e.g. added 3 hours ago Добавлен %1 - + by <b>%1</b> e.g. by SomeArtist - + <b>%1</b> - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum - + <b>%1</b> на <b>%2</b> @@ -1332,13 +1337,13 @@ connect and stream from you? %1 Config - + %1 Настройка %1 Configuration - + %1 Настройка @@ -1445,7 +1450,7 @@ connect and stream from you? Configure the accounts and services used by Tomahawk to search and retrieve music, find your friends and update your status. - + Настройка аккаунтов и сервисов используемых Tomahawk для поиска и извлечения музыки, найти друзей и обновить статус. @@ -1455,7 +1460,7 @@ connect and stream from you? Configure Tomahawk's advanced settings, including network connectivity settings, browser interaction and more. - + Настройка дополнительных возможносте Tomahawk в том числе подключения к сети, интеграцию с браузером, другие. @@ -1511,7 +1516,7 @@ connect and stream from you? Set this to your external IP address or host name. Make sure to forward the port to this host! - + Установите это на ваш внешний ip адресс или имени хоста. Убедитесь в том что проброс портов осуществляется к этому хосту! @@ -1600,12 +1605,12 @@ connect and stream from you? On - Включить + Вкл Off - Выключить + Выкл @@ -2206,7 +2211,7 @@ connect and stream from you? Subscribe to playlist changes - + Следить за изменением плейлиста @@ -2216,7 +2221,7 @@ connect and stream from you? Stop subscribing to changes - + Прекратить следить за изменением плейлиста @@ -2473,14 +2478,14 @@ You may wish to try re-authenticating. &Go to "%1" - + &Перейти к "%1" Go to "%1" - + Перейти к "%1" @@ -2615,7 +2620,7 @@ Please change the filters or try again. Station ran out of tracks! Try tweaking the filters for a new set of songs to play. - + Станция не может найти песни!⏎ ⏎Попытайтесь изменить настройки фильтра, для нового набора песен. @@ -2979,7 +2984,7 @@ Try tweaking the filters for a new set of songs to play. Top Overall - + Самые популярные @@ -3169,7 +3174,7 @@ Try tweaking the filters for a new set of songs to play. Network error parsing shortened link! - + Ошибка сети при создании короткой ссылки! @@ -3177,7 +3182,7 @@ Try tweaking the filters for a new set of songs to play. Track '%1' by %2 is not streamable. - + Песня %1 %2 не потоковая. @@ -3327,308 +3332,178 @@ enter the displayed PIN number here: Tomahawk - - &Quit - Выйти - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - Стать онлайн - - - - Add &Friend... - Добавить друга - - - - U&pdate Collection - Обновить коллекцию - - - - Update Collection - Обновить коллекцию - - - - &Configure Tomahawk... - Настроить Tomahawk... - - - - Load &XSPF... - Загрузить XSPF - - - - Create &New Playlist... - Создать Новый Плейлист - - - - About &Tomahawk... - О Tomahawk - - - - Create New &Automatic Playlist - Создать новый автоматический плейлист - - - - Create New &Station - Создать Новую Станцию - - - - Show Offline Sources - Показать офлайн содержимое - - - - Hide Offline Sources - Скрыть офлайн содержимое - - - - Minimize - Скрыть - - - - Ctrl+M - Ctrl+M - - - - Zoom - Увеличить - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - &Юридическая информация... - - - - Diagnostics... - Диагностика - - - - Fully &Rescan Collection - Заново &проверить коллекцию - - - - Fully Rescan Collection - Заново проверить коллекцию - - - - Play - Играть - - - - Space - Пауза - - - - Previous - Предыдущая - - - - Next - Следующая - - - + Back Назад - + Go back one page Перейти на предыдущую страницу - + Forward Вперед - + Go forward one page Перейдите на следующую страницу - - + + Hide Menu Bar - + Спрятать строку меню приложения - - + + Show Menu Bar - + Показать строку меню приложения - + Search for any artist, album or song... Поиск любого исполнителя, альбома или песни ... - + &Main Menu &Главное меню - - - + + + Connect To Peer Связаться с Peer - + Enter peer address: Введите адрес узла: - + Enter peer port: Введите адрес порта: - + Enter peer key: Введите адрес ключа: - + XSPF Error Ошибка XSPF - + This is not a valid XSPF playlist. Это не является допустимым XSPF плейлистом. - + Failed to save tracks Не удалось сохранить песни - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Некоторые треки в плейлисте не содержат исполнителя и название. Они будут проигнорированы. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + К сожалению, есть проблемы с доступом к аудио устройству или данной песне, текущая песня будет пропущена. Убедитесь, что у вас есть подходящий Phonon backend и необходимые плагины установлены. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + К сожалению, есть проблемы с доступом к аудио устройству или данной песне, текущая песня будет пропущена. - + Station Станция - + Create New Station Создать новую станцию - + Name: Имя: - + Playlist Плейлист - + Automatic Playlist Автоматический Плейлист - + Pause Пауза - + &Play &Играть - + Authentication Error Ошибка авторизации - + Error connecting to SIP: Authentication failed! Ошибка соединения с SIP: Ошибка авторизации! - + %1 by %2 track, artist name %1 %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 Авторское право 2010 - 2012 - + Thanks to: Благодарность - + About Tomahawk О Tomahawk @@ -3964,7 +3839,7 @@ Lyrics for "%1" by %2: Some playlist entries were found without artist and track name, they will be omitted - + Некоторые песни в плейлисте были найдены без название песни и исполнителя, они будет пропушены diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts index 33d7e2aad..6251f7859 100644 --- a/lang/tomahawk_sv.ts +++ b/lang/tomahawk_sv.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately &Lyssna privat - + &Listen Publicly &Lyssna publikt @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle Blanda - + Repeat Upprepa - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3322,308 +3327,178 @@ anger du PIN-koden här: Tomahawk - - &Quit - A&vsluta - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - A&nslut - - - - Add &Friend... - Lägg till &vän... - - - - U&pdate Collection - U&ppdatera samling - - - - Update Collection - Uppdatera samling - - - - &Configure Tomahawk... - &Konfigurera Tomahawk... - - - - Load &XSPF... - Läs in &XSPF... - - - - Create &New Playlist... - Skapa &ny spellista... - - - - About &Tomahawk... - Om &Tomahawk... - - - - Create New &Automatic Playlist - Skapa ny a&utomatisk spellista - - - - Create New &Station - Skapa ny &station - - - - Show Offline Sources - Visa frånkopplade källor - - - - Hide Offline Sources - Dölj frånkopplade källor - - - - Minimize - Minimera - - - - Ctrl+M - Ctrl+M - - - - Zoom - Zoom - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - - - - - Diagnostics... - Diagnostik... - - - - Fully &Rescan Collection - Sök &igenom hela samlingen igen - - - - Fully Rescan Collection - Sök igenom hela samlingen igen - - - - Play - Spela upp - - - - Space - Blanksteg - - - - Previous - Föregående - - - - Next - Nästa - - - + Back - + Go back one page - + Forward - + Go forward one page - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer Anslut till klient - + Enter peer address: Ange klientadress: - + Enter peer port: Ange klientport: - + Enter peer key: Ange klientnyckel: - + XSPF Error XSPF-fel - + This is not a valid XSPF playlist. Detta är inte en giltig XSPF-spellista. - + Failed to save tracks Misslyckades med att spara spår - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Några spår i spellistan innehåller inte någon artist och titel. De kommer att ignoreras. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Tyvärr blev det problem att hitta din ljudenhet eller den valda låten! Nuvarande låt kommer att hoppas över - + Station - + Create New Station Skapa ny station - + Name: Namn: - + Playlist - + Automatic Playlist - + Pause Paus - + &Play - + Authentication Error Autentiseringsfel - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name %1 av %2 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 - + Thanks to: - + About Tomahawk diff --git a/lang/tomahawk_tr.ts b/lang/tomahawk_tr.ts index 4d5ca151a..5a13c979b 100644 --- a/lang/tomahawk_tr.ts +++ b/lang/tomahawk_tr.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately &Gizli Dinle - + &Listen Publicly &Yayınlayarak Dinle @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle Karışık - + Repeat Yenile - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3316,308 +3321,178 @@ enter the displayed PIN number here: - - &Quit - - - - - Ctrl+Q - - - - - Go &Online - - - - - Add &Friend... - - - - - U&pdate Collection - - - - - Update Collection - - - - - &Configure Tomahawk... - - - - - Load &XSPF... - - - - - Create &New Playlist... - - - - - About &Tomahawk... - - - - - Create New &Automatic Playlist - - - - - Create New &Station - - - - - Show Offline Sources - - - - - Hide Offline Sources - - - - - Minimize - - - - - Ctrl+M - - - - - Zoom - - - - - Meta+Ctrl+Z - - - - - &Legal Info... - - - - - Diagnostics... - - - - - Fully &Rescan Collection - - - - - Fully Rescan Collection - - - - - Play - - - - - Space - - - - - Previous - - - - - Next - - - - + Back - + Go back one page - + Forward - + Go forward one page - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer - + Enter peer address: - + Enter peer port: - + Enter peer key: - + XSPF Error - + This is not a valid XSPF playlist. - + Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + Station - + Create New Station - + Name: - + Playlist - + Automatic Playlist - + Pause - + &Play - + Authentication Error - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name - + %1 - %2 current track, some window title - + <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 - + Thanks to: - + About Tomahawk diff --git a/lang/tomahawk_zh_CN.ts b/lang/tomahawk_zh_CN.ts index c0e735825..60c66e8b6 100644 --- a/lang/tomahawk_zh_CN.ts +++ b/lang/tomahawk_zh_CN.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately 私下收听 - + &Listen Publicly 公开收听 @@ -222,32 +222,37 @@ connect and stream from you? 法律信息... - + + &View Logfile + + + + Check For Updates... 检查更新... - + &Controls 控制 - + &Settings 设置 - + &Help 帮助 - + &Window 窗口 - + Main Menu 主菜单 @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle 无序播放 - + Repeat 重复播放 - + Time Elapsed 已播放时间 - + Time Remaining 剩余时间 - + Playing from %1 歌曲来自 %1 - + Share 分享 - + Love 喜欢 @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3327,308 +3332,178 @@ enter the displayed PIN number here: Tomahawk - - &Quit - 退出 - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - 上线 - - - - Add &Friend... - 添加朋友... - - - - U&pdate Collection - 更新收藏 - - - - Update Collection - 更新收藏 - - - - &Configure Tomahawk... - 配置 Tomahawk... - - - - Load &XSPF... - 载入 XSPF... - - - - Create &New Playlist... - 创建新的播放列表... - - - - About &Tomahawk... - 关于 Tomahawk... - - - - Create New &Automatic Playlist - 创建新自动播放列表 - - - - Create New &Station - 创建新电台 - - - - Show Offline Sources - 显示离线资源 - - - - Hide Offline Sources - 隐藏离线资源 - - - - Minimize - 最小化 - - - - Ctrl+M - Ctrl+M - - - - Zoom - 放大 - - - - Meta+Ctrl+Z - Meta+Ctrl+Z - - - - &Legal Info... - 法律信息... - - - - Diagnostics... - 诊断... - - - - Fully &Rescan Collection - 重新完整扫描收藏 - - - - Fully Rescan Collection - 重新完整扫描收藏 - - - - Play - 播放 - - - - Space - Space - - - - Previous - 上一首 - - - - Next - 下一首 - - - + Back 后退 - + Go back one page 转向上一页 - + Forward 下一个 - + Go forward one page 转向下一页 - - + + Hide Menu Bar 隐藏菜单栏 - - + + Show Menu Bar 显示菜单栏 - + Search for any artist, album or song... - + &Main Menu 主菜单 - - - + + + Connect To Peer 连接到客户端 - + Enter peer address: 输入客户端地址： - + Enter peer port: 输入客户端端口： - + Enter peer key: 输入客户端密钥： - + XSPF Error XSPF 错误 - + This is not a valid XSPF playlist. 这不是一个合法的 XSPF 播放列表。 - + Failed to save tracks 保存歌曲失败。 - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. 播放列表中的一些歌曲缺失艺术家和标题，它们将被忽略。 - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. 抱歉，访问音频设备或者指定的歌曲时出错。当前歌曲将被跳过。请确认你正在使用合适的 Phonon 后端并安装了必要的插件。 - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. 抱歉，在访问音频设备或者指定的歌曲时出错。当前歌曲将被跳过。 - + Station 电台 - + Create New Station 创建新电台 - + Name: 名字： - + Playlist 播放列表 - + Automatic Playlist 自动播放列表 - + Pause 暂停 - + &Play 播放 - + Authentication Error 认证错误 - + Error connecting to SIP: Authentication failed! 连接到SIP 时错误：认证失败！ - + %1 by %2 track, artist name %2 的 %1 - + %1 - %2 current track, some window title %1 - %2 - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 版权所有 2010 - 2012 - + Thanks to: 感谢： - + About Tomahawk 关于 Tomahawk diff --git a/lang/tomahawk_zh_TW.ts b/lang/tomahawk_zh_TW.ts index 71b122b7e..6dedcd01c 100644 --- a/lang/tomahawk_zh_TW.ts +++ b/lang/tomahawk_zh_TW.ts @@ -116,13 +116,13 @@ connect and stream from you? - + &Listen Privately 私下聆聽 - + &Listen Publicly 公開聆聽 @@ -222,32 +222,37 @@ connect and stream from you? - + + &View Logfile + + + + Check For Updates... - + &Controls - + &Settings - + &Help - + &Window - + Main Menu @@ -330,37 +335,37 @@ connect and stream from you? AudioControls - + Shuffle 隨機 - + Repeat 重複 - + Time Elapsed - + Time Remaining - + Playing from %1 - + Share - + Love @@ -1076,31 +1081,31 @@ connect and stream from you? PlaylistLargeItemDelegate - + played %1 by you e.g. played 3 hours ago by you - + played %1 by %2 e.g. played 3 hours ago by SomeSource - + added %1 e.g. added 3 hours ago - + by <b>%1</b> e.g. by SomeArtist - + by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum @@ -3316,308 +3321,178 @@ enter the displayed PIN number here: Tomahawk - - &Quit - 結束 - - - - Ctrl+Q - Ctrl+Q - - - - Go &Online - 上網 - - - - Add &Friend... - - - - - U&pdate Collection - 更新收藏 - - - - Update Collection - 更新收藏 - - - - &Configure Tomahawk... - 配置 Tomahawk ... - - - - Load &XSPF... - - - - - Create &New Playlist... - 建立新的播放清單... - - - - About &Tomahawk... - 關於 Tomahawk... - - - - Create New &Automatic Playlist - 建立新的自動播放清單 - - - - Create New &Station - - - - - Show Offline Sources - - - - - Hide Offline Sources - - - - - Minimize - 最小化 - - - - Ctrl+M - Ctrl+M - - - - Zoom - - - - - Meta+Ctrl+Z - - - - - &Legal Info... - - - - - Diagnostics... - 診斷... - - - - Fully &Rescan Collection - 徹底地重新掃描收藏 - - - - Fully Rescan Collection - 徹底地重新掃描收藏 - - - - Play - 播放 - - - - Space - - - - - Previous - 前一首 - - - - Next - 下一首 - - - + Back - + Go back one page - + Forward - + Go forward one page - - + + Hide Menu Bar - - + + Show Menu Bar - + Search for any artist, album or song... - + &Main Menu - - - + + + Connect To Peer 連接點對點 - + Enter peer address: 輸入對等地址： - + Enter peer port: 輸入對等連接埠： - + Enter peer key: 輸入對等密鑰： - + XSPF Error XSPF 錯誤 - + This is not a valid XSPF playlist. - + Failed to save tracks 無法儲存曲目 - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed. - + Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. - + Station - + Create New Station - + Name: 名稱： - + Playlist - + Automatic Playlist - + Pause 暫停 - + &Play - + Authentication Error 驗證錯誤 - + Error connecting to SIP: Authentication failed! - + %1 by %2 track, artist name - + %1 - %2 current track, some window title - + <h2><b>Tomahawk %1<br/>(%2)</h2> <h2><b>Tomahawk %1<br/>(%2)</h2> - + <h2><b>Tomahawk %1</h2> <h2><b>Tomahawk %1</h2> - + Copyright 2010 - 2012 - + Thanks to: - + About Tomahawk From b2ef2552f839fc95da8e977b2d5051ba323af77c Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 5 Jan 2013 02:17:09 +0100 Subject: [PATCH 02/13] * Added new color roles for selection foreground / background. --- src/libtomahawk/utils/TomahawkUtilsGui.cpp | 10 +++++++--- src/libtomahawk/utils/TomahawkUtilsGui.h | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp index 7bc172d6f..c0db15894 100644 --- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp +++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp @@ -200,11 +200,15 @@ drawBackgroundAndNumbers( QPainter* painter, const QString& text, const QRect& f void -drawQueryBackground( QPainter* p, const QPalette& palette, const QRect& r, qreal lightnessFactor ) +drawQueryBackground( QPainter* p, const QRect& r ) { - p->setPen( palette.highlight().color().lighter( lightnessFactor * 100 ) ); - p->setBrush( palette.highlight().color().lighter( lightnessFactor * 100 ) ); + p->save(); + + p->setPen( Colors::SELECTION_BACKGROUND ); + p->setBrush( Colors::SELECTION_BACKGROUND ); p->drawRoundedRect( r, 4.0, 4.0 ); + + p->restore(); } diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.h b/src/libtomahawk/utils/TomahawkUtilsGui.h index 206a016cd..5544a2ee1 100644 --- a/src/libtomahawk/utils/TomahawkUtilsGui.h +++ b/src/libtomahawk/utils/TomahawkUtilsGui.h @@ -41,7 +41,7 @@ class QScrollBar; namespace TomahawkUtils { - DLLEXPORT void drawQueryBackground( QPainter* p, const QPalette& palette, const QRect& r, qreal lightnessFactor = 1 ); + DLLEXPORT void drawQueryBackground( QPainter* p, const QRect& r ); DLLEXPORT QWidget* tomahawkWindow(); /// Platform-specific bringing tomahawk mainwindow to front, b/c qt's activate() and such don't seem to work well enough for us DLLEXPORT void bringToFront(); @@ -82,6 +82,8 @@ namespace TomahawkUtils static const QColor GROUP_HEADER = QColor( "#637180" ); static const QColor NOW_PLAYING_ITEM = QColor( "#962c26" ); static const QColor NOW_PLAYING_ITEM_TEXT = QColor( "#ffffff" ); + static const QColor SELECTION_BACKGROUND = QColor( "#962c26" ); + static const QColor SELECTION_FOREGROUND = QColor( "#ffffff" ); } static const int POPUP_ROUNDING_RADIUS = 6; From 41da9c8a4ee659a3afda70e2ab8f34be52cf69ad Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 5 Jan 2013 02:17:32 +0100 Subject: [PATCH 03/13] * Use new color roles. --- src/libtomahawk/playlist/GridItemDelegate.cpp | 6 +++--- src/libtomahawk/widgets/PlayableCover.cpp | 4 ++-- src/libtomahawk/widgets/QueryLabel.cpp | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/playlist/GridItemDelegate.cpp b/src/libtomahawk/playlist/GridItemDelegate.cpp index 9271dac32..cfc074d06 100644 --- a/src/libtomahawk/playlist/GridItemDelegate.cpp +++ b/src/libtomahawk/playlist/GridItemDelegate.cpp @@ -198,7 +198,7 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, painter->drawRect( gradientRect ); painter->restore(); - painter->setPen( Qt::white ); + painter->setPen( TomahawkUtils::Colors::SELECTION_FOREGROUND ); QRect textRect = option.rect.adjusted( 6, option.rect.height() - frameHeight, -6, -6 ); bool oneLiner = false; @@ -225,8 +225,8 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, r.adjust( 4, 0, -4, -1 ); if ( m_hoveringOver == index ) { - TomahawkUtils::drawQueryBackground( painter, opt.palette, r, 1.1 ); - painter->setPen( opt.palette.color( QPalette::HighlightedText ) ); + TomahawkUtils::drawQueryBackground( painter, r ); + painter->setPen( TomahawkUtils::Colors::SELECTION_FOREGROUND ); } to.setAlignment( Qt::AlignHCenter | Qt::AlignBottom ); diff --git a/src/libtomahawk/widgets/PlayableCover.cpp b/src/libtomahawk/widgets/PlayableCover.cpp index 2c5652f26..016f19b89 100644 --- a/src/libtomahawk/widgets/PlayableCover.cpp +++ b/src/libtomahawk/widgets/PlayableCover.cpp @@ -251,8 +251,8 @@ PlayableCover::paintEvent( QPaintEvent* event ) if ( m_hoveredRect == r ) { - TomahawkUtils::drawQueryBackground( &bufpainter, palette(), r, 1.1 ); - bufpainter.setPen( Qt::white ); + TomahawkUtils::drawQueryBackground( &bufpainter, r ); + bufpainter.setPen( TomahawkUtils::Colors::SELECTION_FOREGROUND ); } to.setAlignment( Qt::AlignHCenter | Qt::AlignBottom ); diff --git a/src/libtomahawk/widgets/QueryLabel.cpp b/src/libtomahawk/widgets/QueryLabel.cpp index 35b11628c..efa6cede4 100644 --- a/src/libtomahawk/widgets/QueryLabel.cpp +++ b/src/libtomahawk/widgets/QueryLabel.cpp @@ -387,21 +387,22 @@ QueryLabel::paintEvent( QPaintEvent* event ) m_hoverType = Track; } - TomahawkUtils::drawQueryBackground( &p, palette(), m_hoverArea ); + TomahawkUtils::drawQueryBackground( &p, m_hoverArea ); } if ( elidedText != s || ( m_result.isNull() && m_query.isNull() && m_artist.isNull() && m_album.isNull() ) ) { if ( m_hoverArea.width() ) { - p.setPen( palette().highlightedText().color() ); - p.setBrush( palette().highlight() ); + p.setBrush( TomahawkUtils::Colors::SELECTION_BACKGROUND ); + p.setPen( TomahawkUtils::Colors::SELECTION_FOREGROUND ); } else { p.setBrush( palette().window() ); p.setPen( palette().color( foregroundRole() ) ); } + p.drawText( r, m_align, elidedText ); } else From 8ff04a834108fe7283e0991518694a732be8c43d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 5 Jan 2013 02:26:43 +0100 Subject: [PATCH 04/13] * Added context menu to PlayableCover. --- src/libtomahawk/widgets/PlayableCover.cpp | 21 +++++++++++++++++++++ src/libtomahawk/widgets/PlayableCover.h | 9 +++++++++ 2 files changed, 30 insertions(+) diff --git a/src/libtomahawk/widgets/PlayableCover.cpp b/src/libtomahawk/widgets/PlayableCover.cpp index 016f19b89..9f5a140e4 100644 --- a/src/libtomahawk/widgets/PlayableCover.cpp +++ b/src/libtomahawk/widgets/PlayableCover.cpp @@ -20,6 +20,7 @@ #include "Artist.h" #include "Album.h" +#include "ContextMenu.h" #include "ViewManager.h" #include "audio/AudioEngine.h" #include "widgets/ImageButton.h" @@ -28,6 +29,7 @@ #include +using namespace Tomahawk; PlayableCover::PlayableCover( QWidget* parent ) : QLabel( parent ) @@ -45,6 +47,9 @@ PlayableCover::PlayableCover( QWidget* parent ) m_button->hide(); connect( m_button, SIGNAL( clicked( bool ) ), SLOT( onClicked() ) ); + + m_contextMenu = new ContextMenu( this ); + m_contextMenu->setSupportedActions( ContextMenu::ActionQueue | ContextMenu::ActionCopyLink | ContextMenu::ActionStopAfter | ContextMenu::ActionLove | ContextMenu::ActionPage ); } @@ -129,6 +134,22 @@ PlayableCover::mouseReleaseEvent( QMouseEvent* event ) } +void +PlayableCover::contextMenuEvent( QContextMenuEvent* event ) +{ + m_contextMenu->clear(); + + if ( m_artist ) + m_contextMenu->setArtist( m_artist ); + else if ( m_album ) + m_contextMenu->setAlbum( m_album ); + else + m_contextMenu->setQuery( m_query ); + + m_contextMenu->exec( event->globalPos() ); +} + + void PlayableCover::setPixmap( const QPixmap& pixmap ) { diff --git a/src/libtomahawk/widgets/PlayableCover.h b/src/libtomahawk/widgets/PlayableCover.h index 0a07af9e7..770351a4b 100644 --- a/src/libtomahawk/widgets/PlayableCover.h +++ b/src/libtomahawk/widgets/PlayableCover.h @@ -28,6 +28,11 @@ class ImageButton; +namespace Tomahawk +{ + class ContextMenu; +}; + /** * \class PlayableCover * \brief QLabel which shows a play/pause button on hovering. @@ -58,6 +63,8 @@ protected: virtual void mouseMoveEvent( QMouseEvent* event ); virtual void mouseReleaseEvent( QMouseEvent* event ); + + virtual void contextMenuEvent( QContextMenuEvent* event ); void leaveEvent( QEvent* event ); void enterEvent( QEvent* event ); @@ -69,6 +76,8 @@ private: QPixmap m_pixmap; ImageButton* m_button; + Tomahawk::ContextMenu* m_contextMenu; + Tomahawk::artist_ptr m_artist; Tomahawk::album_ptr m_album; Tomahawk::query_ptr m_query; From f2913e88491f0b1223b99ad10830ba9f10e60426 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 5 Jan 2013 03:22:03 +0100 Subject: [PATCH 05/13] * Fixed broken signal / slot connect. --- src/libtomahawk/audio/AudioEngine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index 84ae947fd..811c446b2 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -902,7 +902,7 @@ AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist ) connect( m_playlist.data(), SIGNAL( nextTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) ); connect( m_playlist.data(), SIGNAL( shuffleModeChanged( bool ) ), SIGNAL( shuffleModeChanged( bool ) ) ); - connect( m_playlist.data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode ) ), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode ) ) ); + connect( m_playlist.data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) ); emit shuffleModeChanged( m_playlist.data()->shuffled() ); emit repeatModeChanged( m_playlist.data()->repeatMode() ); From a88a5a25500804ebbcff4bb1d482ae1f7c9713e5 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 7 Jan 2013 17:21:12 +0100 Subject: [PATCH 06/13] Change my mail address once again, let's see how long this lasts :-) --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index c07550f06..19a9e07fd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,7 +5,7 @@ Tomahawk is primarily authored by: Contributors include: * Leo Franchi -* Dominik Schmidt +* Dominik Schmidt * Jeff Mitchell * J Herskowitz * Alejandro Wainzinger From 5f1adf99b3dcba23fe4050e949280cb185d1faea Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 7 Jan 2013 17:25:18 +0100 Subject: [PATCH 07/13] Add hugo___ and teo- to AUTHORS --- AUTHORS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 19a9e07fd..2ef2e1853 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,6 +9,8 @@ Contributors include: * Jeff Mitchell * J Herskowitz * Alejandro Wainzinger +* Hugo Lindström +* Teo Mrnjavac Thanks to: From 1268e6a053d784dbfe17bef4f0200d1ea8c9f4e2 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 7 Jan 2013 17:28:54 +0100 Subject: [PATCH 08/13] More teo- fication --- src/TomahawkWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 095499b37..e6f83e33c 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -1226,7 +1226,7 @@ TomahawkWindow::showAboutTomahawk() const QString thanksto( tr( "Thanks to:" ) ); desc = QString( "%1
Christian Muehlhaeuser <muesli@tomahawk-player.org>

" - "%2 Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindström, Syd Lawrence, Michael Zanetti, Harald Sitter, Steve Robertson" ) + "%2 Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindström, Syd Lawrence, Michael Zanetti, Harald Sitter, Steve Robertson, Teo Mrnjavac" ) .arg( copyright ) .arg( thanksto ); From 537903f15a01b199f2f206e4fdf971c28abc0a74 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 7 Jan 2013 22:27:41 +0100 Subject: [PATCH 09/13] Remove winhttp, it was used for liblastfm2 back when we used to ship it --- thirdparty/winhttp/README | 1 - thirdparty/winhttp/winhttp.h | 248 ----------------------------------- 2 files changed, 249 deletions(-) delete mode 100644 thirdparty/winhttp/README delete mode 100644 thirdparty/winhttp/winhttp.h diff --git a/thirdparty/winhttp/README b/thirdparty/winhttp/README deleted file mode 100644 index 230cd51fc..000000000 --- a/thirdparty/winhttp/README +++ /dev/null @@ -1 +0,0 @@ -Note: originally from http://gtk-for-symbian.googlecode.com/svn/trunk/gio/win32/winhttp.h diff --git a/thirdparty/winhttp/winhttp.h b/thirdparty/winhttp/winhttp.h deleted file mode 100644 index fee814c6a..000000000 --- a/thirdparty/winhttp/winhttp.h +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright (C) 2007 Francois Gouget - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WINHTTP_H -#define __WINE_WINHTTP_H - -#define WINHTTPAPI -#define BOOLAPI WINHTTPAPI BOOL WINAPI - - -typedef LPVOID HINTERNET; -typedef HINTERNET *LPHINTERNET; - -#define INTERNET_DEFAULT_PORT 0 -#define INTERNET_DEFAULT_HTTP_PORT 80 -#define INTERNET_DEFAULT_HTTPS_PORT 443 -typedef WORD INTERNET_PORT; -typedef INTERNET_PORT *LPINTERNET_PORT; - -#define INTERNET_SCHEME_HTTP 1 -#define INTERNET_SCHEME_HTTPS 2 -typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; - -/* flags for WinHttpOpen */ -#define WINHTTP_FLAG_ASYNC 0x10000000 - -/* flags for WinHttpOpenRequest */ -#define WINHTTP_FLAG_ESCAPE_PERCENT 0x00000004 -#define WINHTTP_FLAG_NULL_CODEPAGE 0x00000008 -#define WINHTTP_FLAG_ESCAPE_DISABLE 0x00000040 -#define WINHTTP_FLAG_ESCAPE_DISABLE_QUERY 0x00000080 -#define WINHTTP_FLAG_BYPASS_PROXY_CACHE 0x00000100 -#define WINHTTP_FLAG_REFRESH WINHTTP_FLAG_BYPASS_PROXY_CACHE -#define WINHTTP_FLAG_SECURE 0x00800000 - -#define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0 -#define WINHTTP_ACCESS_TYPE_NO_PROXY 1 -#define WINHTTP_ACCESS_TYPE_NAMED_PROXY 3 - -#define WINHTTP_NO_PROXY_NAME NULL -#define WINHTTP_NO_PROXY_BYPASS NULL - -#define WINHTTP_NO_REFERER NULL -#define WINHTTP_DEFAULT_ACCEPT_TYPES NULL - -#define WINHTTP_ERROR_BASE 12000 - -/* The original WINE winhttp.h didn't contain symbolic names for the - * error codes. However, the values of most of them are publicly - * documented at - * http://msdn.microsoft.com/en-us/library/aa383770(VS.85).aspx so - * we can add them here. - */ -#define ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR 12178 -#define ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT 12166 -#define ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN 12103 -#define ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND 12102 -#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN 12100 -#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND 12101 -#define ERROR_WINHTTP_CANNOT_CONNECT 12029 -#define ERROR_WINHTTP_CHUNKED_ENCODING_HEADER_SIZE_OVERFLOW 12183 -#define ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED 12044 -#define ERROR_WINHTTP_CONNECTION_ERROR 12030 -#define ERROR_WINHTTP_HEADER_ALREADY_EXISTS 12155 -#define ERROR_WINHTTP_HEADER_COUNT_EXCEEDED 12181 -#define ERROR_WINHTTP_HEADER_NOT_FOUND 12150 -#define ERROR_WINHTTP_HEADER_SIZE_OVERFLOW 12182 -#define ERROR_WINHTTP_INCORRECT_HANDLE_STATE 12019 -#define ERROR_WINHTTP_INCORRECT_HANDLE_TYPE 12018 -#define ERROR_WINHTTP_INTERNAL_ERROR 12004 -#define ERROR_WINHTTP_INVALID_OPTION 12009 -#define ERROR_WINHTTP_INVALID_QUERY_REQUEST 12154 -#define ERROR_WINHTTP_INVALID_SERVER_RESPONSE 12152 -#define ERROR_WINHTTP_INVALID_URL 12005 -#define ERROR_WINHTTP_LOGIN_FAILURE 12015 -#define ERROR_WINHTTP_NAME_NOT_RESOLVED 12007 -#define ERROR_WINHTTP_NOT_INITIALIZED 12172 -#define ERROR_WINHTTP_OPERATION_CANCELLED 12017 -#define ERROR_WINHTTP_OPTION_NOT_SETTABLE 12011 -#define ERROR_WINHTTP_OUT_OF_HANDLES 12001 -#define ERROR_WINHTTP_REDIRECT_FAILED 12156 -#define ERROR_WINHTTP_RESEND_REQUEST 12032 -#define ERROR_WINHTTP_RESPONSE_DRAIN_OVERFLOW 12184 -#define ERROR_WINHTTP_SECURE_CERT_CN_INVALID 12038 -#define ERROR_WINHTTP_SECURE_CERT_DATE_INVALID 12037 -#define ERROR_WINHTTP_SECURE_CERT_REV_FAILED 12057 -#define ERROR_WINHTTP_SECURE_CERT_REVOKED 12170 -#define ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE 12179 -#define ERROR_WINHTTP_SECURE_CHANNEL_ERROR 12157 -#define ERROR_WINHTTP_SECURE_FAILURE 12175 -#define ERROR_WINHTTP_SECURE_INVALID_CA 12045 -#define ERROR_WINHTTP_SECURE_INVALID_CERT 12169 -#define ERROR_WINHTTP_SHUTDOWN 12012 -#define ERROR_WINHTTP_TIMEOUT 12002 -#define ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT 12167 -#define ERROR_WINHTTP_UNRECOGNIZED_SCHEME 12006 -/* End of added error codes */ - -#define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) - -typedef struct -{ - DWORD dwStructSize; - LPWSTR lpszScheme; - DWORD dwSchemeLength; - INTERNET_SCHEME nScheme; - LPWSTR lpszHostName; - DWORD dwHostNameLength; - INTERNET_PORT nPort; - LPWSTR lpszUserName; - DWORD dwUserNameLength; - LPWSTR lpszPassword; - DWORD dwPasswordLength; - LPWSTR lpszUrlPath; - DWORD dwUrlPathLength; - LPWSTR lpszExtraInfo; - DWORD dwExtraInfoLength; -} URL_COMPONENTS, *LPURL_COMPONENTS; -typedef URL_COMPONENTS URL_COMPONENTSW; -typedef LPURL_COMPONENTS LPURL_COMPONENTSW; - -typedef struct -{ - DWORD_PTR dwResult; - DWORD dwError; -} WINHTTP_ASYNC_RESULT, *LPWINHTTP_ASYNC_RESULT; - -typedef struct -{ - FILETIME ftExpiry; - FILETIME ftStart; - LPWSTR lpszSubjectInfo; - LPWSTR lpszIssuerInfo; - LPWSTR lpszProtocolName; - LPWSTR lpszSignatureAlgName; - LPWSTR lpszEncryptionAlgName; - DWORD dwKeySize; -} WINHTTP_CERTIFICATE_INFO; - -typedef struct -{ - DWORD dwAccessType; - LPCWSTR lpszProxy; - LPCWSTR lpszProxyBypass; -} WINHTTP_PROXY_INFO, *LPWINHTTP_PROXY_INFO; -typedef WINHTTP_PROXY_INFO WINHTTP_PROXY_INFOW; -typedef LPWINHTTP_PROXY_INFO LPWINHTTP_PROXY_INFOW; - -typedef struct -{ - BOOL fAutoDetect; - LPWSTR lpszAutoConfigUrl; - LPWSTR lpszProxy; - LPWSTR lpszProxyBypass; -} WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; - -typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); - -typedef struct -{ - DWORD dwFlags; - DWORD dwAutoDetectFlags; - LPCWSTR lpszAutoConfigUrl; - LPVOID lpvReserved; - DWORD dwReserved; - BOOL fAutoLogonIfChallenged; -} WINHTTP_AUTOPROXY_OPTIONS; - -typedef struct -{ - DWORD dwMajorVersion; - DWORD dwMinorVersion; -} HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; - - -#ifdef __cplusplus -extern "C" { -#endif - -BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); -BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); -BOOL WINAPI WinHttpCheckPlatform(void); -BOOL WINAPI WinHttpCloseHandle(HINTERNET); -HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); -BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); -BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); -BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config); -BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); -HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); - -/* The sixth parameter to WinHttpOpenRequest was wrong in the original - * WINE header. It should be LPCWSTR*, not LPCWSTR, as it points to an - * array of wide strings. - */ -HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); -BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); -BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); -BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); -BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); -BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); -BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); -WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); -BOOL WINAPI WinHttpTimeFromSystemTime(CONST SYSTEMTIME *,LPWSTR); -BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); -BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); - -/* Additional definitions, from the public domain in mingw */ -#define ICU_ESCAPE 0x80000000 -#define ICU_DECODE 0x10000000 - -/* A few constants I couldn't find publicly documented, so I looked up - * their value from the Windows SDK . Presumably this falls - * under fair use. - */ -#define WINHTTP_QUERY_CONTENT_LENGTH 5 -#define WINHTTP_QUERY_CONTENT_TYPE 1 -#define WINHTTP_QUERY_LAST_MODIFIED 11 -#define WINHTTP_QUERY_STATUS_CODE 19 -#define WINHTTP_QUERY_STATUS_TEXT 20 - -#define WINHTTP_QUERY_FLAG_SYSTEMTIME 0x40000000 - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_WINHTTP_H */ From cf10b6d6e1088684bc5b42979e0a9dcff6a271a1 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 7 Jan 2013 22:49:42 +0100 Subject: [PATCH 10/13] Don't build against Jreen 1.1.0 and document it in README --- CMakeLists.txt | 3 +++ README.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7221bc5e..9bb0b7acf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,9 @@ macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloa macro_optional_find_package(Jreen 1.0.5) macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n") +if(${PC_JREEN_VERSION} STREQUAL "1.1.0") + message(FATAL_ERROR "Jreen 1.1.0 has a very annoying bug that breaks accepting auth requests in Tomahawk. Please upgrade to 1.1.1 or downgrade to 1.0.5.") +endif() macro_optional_find_package(QTweetLib) macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n") diff --git a/README.md b/README.md index 043410d76..1f2ca36f4 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Required dependencies: The following dependencies are optional, but recommended: -* Jreen 1.0.5 - http://qutim.org/jreen / https://github.com/euroelessar/jreen +* Jreen 1.0.5 (1.1.0 will fail, 1.1.1 is fine) - http://qutim.org/jreen / https://github.com/euroelessar/jreen * QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib Third party libraries that we ship with our source: From 3efe99442579d08746d6ba629a96d84b4de1f35d Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 7 Jan 2013 22:51:39 +0100 Subject: [PATCH 11/13] Add more thirdparty libs shipped in our tree to the README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 1f2ca36f4..bc7067d11 100644 --- a/README.md +++ b/README.md @@ -57,5 +57,10 @@ Third party libraries that we ship with our source: * MiniUPnP 1.6 - http://miniupnp.free.fr/ * Breakpad - http://code.google.com/p/google-breakpad/ +* Qocoa - http://github.com/mikemcquaid/Qocoa +* libqnetwm - http://code.google.com/p/libqnetwm/ +* libqxt (QxtWeb module) - http://libqxt.org +* SPMediaKeyTap - https://github.com/nevyn/SPMediaKeyTap +* kdsingleapplicationguard/ Enjoy! From a1330254b075d440a9351adf8f399eb418e9ffce Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 7 Jan 2013 22:54:59 +0100 Subject: [PATCH 12/13] Remove trailing / --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bc7067d11..48f46b8dc 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,6 @@ Third party libraries that we ship with our source: * libqnetwm - http://code.google.com/p/libqnetwm/ * libqxt (QxtWeb module) - http://libqxt.org * SPMediaKeyTap - https://github.com/nevyn/SPMediaKeyTap -* kdsingleapplicationguard/ +* kdsingleapplicationguard Enjoy! From 8305a44900ebc45aad124cd80712a45213e63614 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Tue, 8 Jan 2013 02:43:58 +0100 Subject: [PATCH 13/13] Fix registering DatabaseCommand_LoadSocialActions::TrackActions metatype --- src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h index fdc987bd5..be6a78d76 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h @@ -78,7 +78,7 @@ public: : DatabaseCommand( parent ), m_actionOnly( action ) { setSource( source ); - qRegisterMetaType( "DatabaseCommand_LoadSocialAction::TrackActions" ); + qRegisterMetaType( "DatabaseCommand_LoadSocialActions::TrackActions" ); } /**