From 1f53a36475802116e84dded35a98ba65626df90a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 5 Apr 2010 20:17:44 +0000 Subject: kde notifier: better compatibility with opendesktop notification server 1.1 spec, removedhtml tags and other imrovements (patch by Artur Guzik) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1656 90c681e8-e032-0410-971d-27865f9a5e38 --- .../hotkey/translations/hotkey_plugin_cs.ts | 4 +- .../hotkey/translations/hotkey_plugin_de.ts | 4 +- .../hotkey/translations/hotkey_plugin_it.ts | 4 +- .../hotkey/translations/hotkey_plugin_lt.ts | 4 +- .../hotkey/translations/hotkey_plugin_pl.ts | 4 +- .../hotkey/translations/hotkey_plugin_ru.ts | 4 +- .../hotkey/translations/hotkey_plugin_tr.ts | 4 +- .../hotkey/translations/hotkey_plugin_uk_UA.ts | 4 +- .../hotkey/translations/hotkey_plugin_zh_CN.ts | 4 +- .../hotkey/translations/hotkey_plugin_zh_TW.ts | 4 +- src/plugins/General/kdenotify/kdenotify.cpp | 94 +++++++++----- src/plugins/General/kdenotify/kdenotify.h | 17 ++- src/plugins/General/kdenotify/settingsdialog.cpp | 6 +- src/plugins/General/kdenotify/settingsdialog.ui | 138 +++++++++++++-------- .../kdenotify/translations/kdenotify_plugin_cs.ts | 29 +++-- .../kdenotify/translations/kdenotify_plugin_de.ts | 29 +++-- .../kdenotify/translations/kdenotify_plugin_it.ts | 29 +++-- .../kdenotify/translations/kdenotify_plugin_lt.ts | 29 +++-- .../kdenotify/translations/kdenotify_plugin_pl.ts | 29 +++-- .../kdenotify/translations/kdenotify_plugin_ru.ts | 29 +++-- .../kdenotify/translations/kdenotify_plugin_tr.ts | 27 +++- .../translations/kdenotify_plugin_uk_UA.ts | 29 +++-- .../translations/kdenotify_plugin_zh_CN.ts | 27 +++- .../translations/kdenotify_plugin_zh_TW.ts | 27 +++- src/qmmpui/translations/libqmmpui_cs.ts | 2 +- src/qmmpui/translations/libqmmpui_de.ts | 2 +- src/qmmpui/translations/libqmmpui_it.ts | 2 +- src/qmmpui/translations/libqmmpui_lt.ts | 2 +- src/qmmpui/translations/libqmmpui_pl.ts | 2 +- src/qmmpui/translations/libqmmpui_pt_BR.ts | 2 +- src/qmmpui/translations/libqmmpui_ru.ts | 2 +- src/qmmpui/translations/libqmmpui_tr.ts | 2 +- src/qmmpui/translations/libqmmpui_uk_UA.ts | 2 +- src/qmmpui/translations/libqmmpui_zh_CN.ts | 2 +- src/qmmpui/translations/libqmmpui_zh_TW.ts | 2 +- 35 files changed, 411 insertions(+), 190 deletions(-) (limited to 'src') diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts index f4e9cb3b1..e9e27c436 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts @@ -9,12 +9,12 @@ Změnit zkratku - + Press the key combination you want to assign Stlačte kombinaci kláves, kterou chcete přiřadit - + Clear Smazat diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts index 765043397..108218882 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts @@ -9,12 +9,12 @@ Kurzbefehl bearbeiten - + Press the key combination you want to assign Drücken Sie die Tastenkombination, die verwendet werden soll - + Clear Zurücksetzen diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts index 09ef13a18..ced62c87a 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts @@ -9,12 +9,12 @@ Moidifica la scorciatoia - + Press the key combination you want to assign Premi la combinazione di tasti che vuoi assegnare - + Clear Pulisci diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts index 4554c69c6..58ddaf00a 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts @@ -9,12 +9,12 @@ Keisti nuorodą - + Press the key combination you want to assign Paspauskite klavišų kombinaciją, kurią norite priskirti - + Clear Išvalyti diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_pl.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_pl.ts index de1ba58a0..e000e0be3 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_pl.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_pl.ts @@ -9,12 +9,12 @@ Modyfikuj skrót - + Press the key combination you want to assign Wciśnij kombinację klawiszy, którą chcesz przypisać - + Clear Wyczyść diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts index be84f2811..c110a746c 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts @@ -9,12 +9,12 @@ Изменить сочетание клавиш - + Press the key combination you want to assign Нажмите клавиши, сочетание которых вы хотите использовать - + Clear Очистить diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts index 9c36d964f..767bac40a 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts @@ -9,12 +9,12 @@ Kısayolu Düzenle - + Press the key combination you want to assign Atamak istediğiniz tuş kombinasyonuna basın - + Clear Temizle diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts index a9380e44f..1d4932a7e 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts @@ -9,12 +9,12 @@ Змінити комбінації клавіш - + Press the key combination you want to assign Натисніть клавіші, які Ви бажаєте призначити - + Clear Очистити diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts index d152c2d11..d5c8f20f7 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts @@ -9,12 +9,12 @@ 修改快捷键 - + Press the key combination you want to assign 请按您想指派的组合键 - + Clear 清除 diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts index acaeaa620..cf5fe921e 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts @@ -9,12 +9,12 @@ 修改熱鍵 - + Press the key combination you want to assign 請按您想指定的組合鍵 - + Clear 清除 diff --git a/src/plugins/General/kdenotify/kdenotify.cpp b/src/plugins/General/kdenotify/kdenotify.cpp index 892967013..b33f7d789 100644 --- a/src/plugins/General/kdenotify/kdenotify.cpp +++ b/src/plugins/General/kdenotify/kdenotify.cpp @@ -28,33 +28,33 @@ #include #include #include +#include + #include #include #include + #include "kdenotify.h" -KdeNotify::KdeNotify(QObject *parent) : General(parent),m_UseFreedesktopSpec(false) +KdeNotify::KdeNotify(QObject *parent) : General(parent),m_useFreedesktopSpec(true) { - notifier = new QDBusInterface("org.kde.VisualNotifications", - "/VisualNotifications", "org.kde.VisualNotifications", + m_notifier = new QDBusInterface("org.freedesktop.Notifications", + "/org/freedesktop/Notifications","org.freedesktop.Notifications", QDBusConnection::sessionBus(), this); - if(notifier->lastError().type() != QDBusError::NoError) + if(m_notifier->lastError().type() != QDBusError::NoError) { - delete(notifier); - qWarning() << "KdeNotify: unable to create dbus interface." - << "Have you got KDE SC 4.4 or newer? Lets try..."; - - notifier = new QDBusInterface("org.freedesktop.Notifications", - "/org/freedesktop/Notifications","org.freedesktop.Notifications"); - if(notifier->lastError().type() != QDBusError::NoError) + delete(m_notifier); + m_notifier = new QDBusInterface("org.kde.VisualNotifications", + "/VisualNotifications", "org.kde.VisualNotifications", + QDBusConnection::sessionBus(), this); + if(m_notifier->lastError().type() != QDBusError::NoError) { - qWarning() << "KdeNotify: Can't create interface. Sorry."; + qWarning() << "KdeNotify: Unable to create interface."; return; } - m_UseFreedesktopSpec = true; + m_useFreedesktopSpec = false; } qWarning() << "KdeNotify: DBus interfece created successfully."; - //m_ConfigDir = QFileInfo(Qmmp::configFile()).absoluteDir().path(); QString path = QFileInfo(Qmmp::configFile()).absoluteDir().path(); QDir dir(path); if(!dir.exists("kdenotifycache")) @@ -65,17 +65,27 @@ KdeNotify::KdeNotify(QObject *parent) : General(parent),m_UseFreedesktopSpec(fal QSettings settings(Qmmp::configFile(),QSettings::IniFormat); settings.beginGroup("Kde_Notifier"); - m_NotifyDelay = settings.value("notify_delay",10000).toInt(); - m_ShowCovers = settings.value("show_covers",true).toBool(); + m_notifyDuration = settings.value("notify_duration",5000).toInt(); + m_showCovers = settings.value("show_covers",true).toBool(); m_template = settings.value("template", DEFAULT_TEMPLATE).toString(); m_template.remove("\n"); + m_updateNotify = settings.value("update_notify",true).toBool(); settings.endGroup(); + m_currentNotifyId = 0; - QTimer *timer = new QTimer(this); - timer->setSingleShot(true); - timer->setInterval(3000); //after that notification will be showed. - connect(timer,SIGNAL(timeout()),SLOT(showMetaData())); - connect(SoundCore::instance(),SIGNAL(metaDataChanged()),timer, SLOT(start())); + if(m_updateNotify) + { + connect(SoundCore::instance(),SIGNAL(metaDataChanged()),SLOT(showMetaData())); + connect(m_notifier,SIGNAL(NotificationClosed(uint,uint)),this,SLOT(notificationClosed(uint,uint))); + } + else + { + QTimer *timer = new QTimer(this); + timer->setSingleShot(true); + timer->setInterval(NOTIFY_DELAY); //after that notification will be showed. + connect(timer,SIGNAL(timeout()),SLOT(showMetaData())); + connect(SoundCore::instance(),SIGNAL(metaDataChanged()),timer, SLOT(start())); + } } KdeNotify::~KdeNotify() @@ -105,37 +115,39 @@ QList KdeNotify::prepareNotification() } QList args; args.append("Qmmp"); //app-name - args.append(0U); //replaces-id - if(!m_UseFreedesktopSpec) + args.append(m_currentNotifyId); //replaces-id; + if(!m_useFreedesktopSpec) args.append(""); //event-id - args.append(m_imagesDir + "/app_icon.png"); //app-icon(path to icon on disk) + args.append(m_imagesDir + "/app.png"); //app-icon(path to icon on disk) args.append(tr("Qmmp now playing:")); //summary (notification title) MetaDataFormatter f(m_template); QString body = f.parse(core->metaData(), core->totalTime()/1000); QString coverPath; - if(m_ShowCovers) + if(m_showCovers) { - QPixmap cover = MetaDataManager::instance()->instance()->getCover(core->metaData(Qmmp::URL)); + QPixmap cover = MetaDataManager::instance()->getCover(core->metaData(Qmmp::URL)); if(!cover.isNull()) { coverPath = m_coverPath; - cover.scaled(100,100,Qt::IgnoreAspectRatio,Qt::SmoothTransformation).save(coverPath); + cover.scaled(90,90,Qt::IgnoreAspectRatio,Qt::SmoothTransformation).save(coverPath); } } if(coverPath.isEmpty()) coverPath = m_imagesDir + "/empty_cover.png"; QString nBody; - nBody.append("
"); - nBody.append("%2
"); - nBody = nBody.arg(coverPath,body); - + nBody.append(body); args.append(nBody); //body + args.append(QStringList()); //actions - args.append(QVariantMap()); //hints - args.append(m_NotifyDelay); //timeout + + QVariantMap hints; + hints.insert("image_path",coverPath); + args.append(hints); //hints + + args.append(m_notifyDuration); //timeout return args; } @@ -144,5 +156,19 @@ void KdeNotify::showMetaData() { QList n = prepareNotification(); if(!n.isEmpty()) - notifier->callWithArgumentList(QDBus::NoBlock,"Notify",n); + { + QDBusReply reply = m_notifier->callWithArgumentList(QDBus::Block,"Notify",n); + if(reply.isValid() && m_updateNotify) + { + m_currentNotifyId = reply.value(); + } + } +} + +void KdeNotify::notificationClosed(uint id, uint reason) +{ + Q_UNUSED(reason); + qWarning() << "notificationClosed: " << id; + if(m_currentNotifyId == id) + m_currentNotifyId = 0; } diff --git a/src/plugins/General/kdenotify/kdenotify.h b/src/plugins/General/kdenotify/kdenotify.h index 26aae0cdf..937c383f6 100644 --- a/src/plugins/General/kdenotify/kdenotify.h +++ b/src/plugins/General/kdenotify/kdenotify.h @@ -28,8 +28,10 @@ #include "qmmp/qmmp.h" #define DEFAULT_TEMPLATE "%if(%t,%t,%f)\n%if(%p,
%p,)\n%if(%a,
%a,)\n%if(%l,
%l,)" +#define NOTIFY_DELAY 2 class QDBusInterface; +class QTimer; class KdeNotify : public General { @@ -40,17 +42,20 @@ public: private: QList prepareNotification(); - QDBusInterface *notifier; + QString totalTimeString(); + QDBusInterface *m_notifier; QString m_coverPath; - int m_NotifyDelay; - bool m_ShowCovers; - bool m_UseFreedesktopSpec; + int m_notifyDuration; + unsigned int m_currentNotifyId; + bool m_showCovers; + bool m_useFreedesktopSpec; + bool m_updateNotify; QString m_template; QString m_imagesDir; - + private slots: void showMetaData(); - QString totalTimeString(); + void notificationClosed(uint id, uint reason); }; #endif // KDENOTIFY_H diff --git a/src/plugins/General/kdenotify/settingsdialog.cpp b/src/plugins/General/kdenotify/settingsdialog.cpp index 7bc7399bf..b3e835ca8 100644 --- a/src/plugins/General/kdenotify/settingsdialog.cpp +++ b/src/plugins/General/kdenotify/settingsdialog.cpp @@ -34,8 +34,9 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QSettings settings(Qmmp::configFile(),QSettings::IniFormat); settings.beginGroup("Kde_Notifier"); - ui->kNotifyDelaySpinBox->setValue(settings.value("notify_delay",10000).toInt()); + ui->notifyDelaySpinBox->setValue(settings.value("notify_duration",10000).toInt()/1000); ui->showCoversCheckBox->setChecked(settings.value("show_covers",true).toBool()); + ui->updateNotifyCheckBox->setChecked(settings.value("update_notify",true).toBool()); m_template = settings.value("template", DEFAULT_TEMPLATE).toString(); settings.endGroup(); } @@ -49,9 +50,10 @@ void SettingsDialog::accept() { QSettings settings(Qmmp::configFile(),QSettings::IniFormat); settings.beginGroup("Kde_Notifier"); - settings.setValue("notify_delay",ui->kNotifyDelaySpinBox->value()); + settings.setValue("notify_duration",ui->notifyDelaySpinBox->value()*1000); settings.setValue("show_covers",ui->showCoversCheckBox->isChecked()); settings.setValue("template",m_template); + settings.setValue("update_notify",ui->updateNotifyCheckBox->isChecked()); settings.endGroup(); QDialog::accept(); } diff --git a/src/plugins/General/kdenotify/settingsdialog.ui b/src/plugins/General/kdenotify/settingsdialog.ui index 67785333d..af210c756 100644 --- a/src/plugins/General/kdenotify/settingsdialog.ui +++ b/src/plugins/General/kdenotify/settingsdialog.ui @@ -6,8 +6,8 @@ 0 0 - 296 - 125 + 349 + 230 @@ -23,54 +23,6 @@ 6 - - - - Notification delay [ms]: - - - - - - - 50000 - - - 10000 - - - - - - - Show covers - - - - - - - - - Change template - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -81,6 +33,92 @@ + + + + Options + + + + + + Notification delay [s]: + + + + + + + 100 + + + 10 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Update visible notification instead create new + + + + + + + + + + Appearance + + + + + + Show covers + + + + + + + + + Change template + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts index bd8fbd8c8..962c50d70 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: Qmmp nyní přehrává: @@ -36,22 +36,37 @@ Nastavení notifikačního modulu pro KDE4 - - Notification delay [ms]: - Prodleva notifikace [ms]: + + Options + + + + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + - + Show covers - + Change template - + Notification Template diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts index f9ce9c765..57c6d1b11 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: Qmmp spielt zurzeit: @@ -36,22 +36,37 @@ Einstellungen KDE-4-Benachrichtigungsmodul - - Notification delay [ms]: - Benachrichtigungsdauer (ms): + + Options + + + + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + - + Show covers Cover anzeigen - + Change template - + Notification Template diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts index dba21edac..36ea527ea 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: Qmmp ora in esecuzione: @@ -36,22 +36,37 @@ Impostazioni del plugin di notificazione per KDE 4 - - Notification delay [ms]: - Ritardo notificazione [ms]: + + Options + + + + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + - + Show covers Mostra copertine - + Change template - + Notification Template diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts index 32df41ab7..638184a2d 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: Qmmp dabar groja: @@ -37,22 +37,37 @@ KDE 4 pranešimų įskiepio nustatymai - - Notification delay [ms]: - Pranešimo užlaikymas [ms]: + + Options + + + + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + - + Show covers - + Change template - + Notification Template diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts index a975d06d8..01d2f6647 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: Qmmp teraz odtwarza: @@ -37,22 +37,37 @@ Ustawienia wtyczki Powiadamianie KDE 4 - - Notification delay [ms]: - Czas zanikania [ms]: + + Options + + + + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + - + Show covers - + Change template - + Notification Template diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts index 3bc81f68d..6350e4315 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: Играет: @@ -37,22 +37,37 @@ Настройки модуля уведомлений KDE4 - - Notification delay [ms]: - Задержка уведомления [мс]: + + Options + - + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + + + + Show covers Показывать обложки - + Change template Изменить шаблон - + Notification Template Шаблон уведомления diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts index 15e7d6c89..961606d36 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: @@ -36,22 +36,37 @@ - - Notification delay [ms]: + + Options - + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + + + + Show covers - + Change template - + Notification Template diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts index b3632d63f..bbeb1d225 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: Відтворюється: @@ -37,22 +37,37 @@ Налаштування модуля повідомлень KDE4 - - Notification delay [ms]: - Час показу [мс]: + + Options + - + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + + + + Show covers Показати обкладинки - + Change template Змінити шаблон - + Notification Template Шаблон повідомлення diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts index 15e7d6c89..961606d36 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: @@ -36,22 +36,37 @@ - - Notification delay [ms]: + + Options - + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + + + + Show covers - + Change template - + Notification Template diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts index 15e7d6c89..961606d36 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts @@ -4,7 +4,7 @@ KdeNotify - + Qmmp now playing: @@ -36,22 +36,37 @@ - - Notification delay [ms]: + + Options - + + Notification delay [s]: + + + + + Update visible notification instead create new + + + + + Appearance + + + + Show covers - + Change template - + Notification Template diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts index 070f850c6..350da3854 100644 --- a/src/qmmpui/translations/libqmmpui_cs.ts +++ b/src/qmmpui/translations/libqmmpui_cs.ts @@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Seznam skladeb diff --git a/src/qmmpui/translations/libqmmpui_de.ts b/src/qmmpui/translations/libqmmpui_de.ts index b8b701883..cc2fd4f52 100644 --- a/src/qmmpui/translations/libqmmpui_de.ts +++ b/src/qmmpui/translations/libqmmpui_de.ts @@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Wiedergabeliste diff --git a/src/qmmpui/translations/libqmmpui_it.ts b/src/qmmpui/translations/libqmmpui_it.ts index da4e550d3..12f036718 100644 --- a/src/qmmpui/translations/libqmmpui_it.ts +++ b/src/qmmpui/translations/libqmmpui_it.ts @@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Lista esecuzione diff --git a/src/qmmpui/translations/libqmmpui_lt.ts b/src/qmmpui/translations/libqmmpui_lt.ts index c514b592f..4e1b24a1b 100644 --- a/src/qmmpui/translations/libqmmpui_lt.ts +++ b/src/qmmpui/translations/libqmmpui_lt.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Grojaraštis diff --git a/src/qmmpui/translations/libqmmpui_pl.ts b/src/qmmpui/translations/libqmmpui_pl.ts index 4e5073f5a..e637e5bc9 100644 --- a/src/qmmpui/translations/libqmmpui_pl.ts +++ b/src/qmmpui/translations/libqmmpui_pl.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Lista odtwarzania diff --git a/src/qmmpui/translations/libqmmpui_pt_BR.ts b/src/qmmpui/translations/libqmmpui_pt_BR.ts index 693655e66..7b219bc02 100644 --- a/src/qmmpui/translations/libqmmpui_pt_BR.ts +++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts index 77294bc21..7bf83a891 100644 --- a/src/qmmpui/translations/libqmmpui_ru.ts +++ b/src/qmmpui/translations/libqmmpui_ru.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Список diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts index 95c2de02f..7d090faff 100644 --- a/src/qmmpui/translations/libqmmpui_tr.ts +++ b/src/qmmpui/translations/libqmmpui_tr.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts index d63eb000a..4d02edfae 100644 --- a/src/qmmpui/translations/libqmmpui_uk_UA.ts +++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Список diff --git a/src/qmmpui/translations/libqmmpui_zh_CN.ts b/src/qmmpui/translations/libqmmpui_zh_CN.ts index 62d94f22d..3cd266fe7 100644 --- a/src/qmmpui/translations/libqmmpui_zh_CN.ts +++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts index f69e7b8e8..288a87438 100644 --- a/src/qmmpui/translations/libqmmpui_zh_TW.ts +++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist -- cgit v1.2.3-13-gbd6f