From a54f4802de1644258a6af31266101459df2e4eef Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Mar 2015 11:31:46 +0000 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) --- ksmserver/plasma_workspace.notifyrc | 2 +- runners/baloo/plasma-runner-baloosearch.desktop | 1 + systemmonitor/ksysguard.desktop | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ksmserver/plasma_workspace.notifyrc b/ksmserver/plasma_workspace.notifyrc index e67caed11..cb6a563e7 100644 --- a/ksmserver/plasma_workspace.notifyrc +++ b/ksmserver/plasma_workspace.notifyrc @@ -769,7 +769,7 @@ Comment[el]=Ξεκινά μια νέα συνεδρία Comment[en_GB]=A new session is starting Comment[es]=Está iniciando una nueva sesión Comment[fi]=Uusi istunto alkaa -Comment[fr]=Une nouvelle session est en train de démarrer +Comment[fr]=Une nouvelle session démarre Comment[hu]=Egy új munkamenet kezdődött Comment[id]=Sesi baru dijalankan Comment[it]=Avvio di una nuova sessione in corso diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop index a314f918a..7895391bf 100644 --- a/runners/baloo/plasma-runner-baloosearch.desktop +++ b/runners/baloo/plasma-runner-baloosearch.desktop @@ -47,6 +47,7 @@ Comment[el]=Εκτελεστής που εκτελεί αναζήτηση σε Comment[en_GB]=Runner which searches through files, emails and contacts Comment[es]=Lanzador que busca en archivos, correo electrónico y contactos Comment[fi]=Suoritusohjelma, joka etsii tiedostoista, sähköposteista ja yhteystiedoista +Comment[fr]=Un lanceur qui effectue une recherche dans les fichiers, les courriels et les contacts. Comment[hu]=Futtató, amely fájlokban, e-mailekben és névjegyekben keres Comment[id]=Pelari yang mencari berkas, email dan kontak Comment[it]=Esecutore che cerca tra file, messaggi di posta e contatti diff --git a/systemmonitor/ksysguard.desktop b/systemmonitor/ksysguard.desktop index e07e30e4b..a554e8988 100644 --- a/systemmonitor/ksysguard.desktop +++ b/systemmonitor/ksysguard.desktop @@ -57,6 +57,7 @@ Comment[el]=Εκτελεί το KSysguard με Ctrl + Escape Comment[en_GB]=Launches KSysguard on Ctrl + Escape Comment[es]=Lanza KSysguard al pulsar Ctrl + Escape Comment[fi]=Käynnistää KSysGuardin painamalla Ctrl+Esc +Comment[fr]=Lancer KSysguard avec Ctrl + Echap Comment[gl]=Inicia KSysguard con Ctrl + Escape Comment[hu]=KSysguard futtatása a Ctrl+Esc megnyomásakor Comment[id]=Jalankan KSysguard dengan Ctrl + Escape From b169753ce33bff5a4f8d0983226fec7790df85d8 Mon Sep 17 00:00:00 2001 From: Martin Klapetek Date: Tue, 10 Mar 2015 18:31:50 +0100 Subject: [PATCH 2/2] [libtaskmanager] Use the icon loaded from config file for launchers This fixes launchers without .desktop files to not have icons in some cases. The patch makes sure the icon that is read from the config file is actually used for the launcher. Reviewed-by: Eike Hein --- libtaskmanager/groupmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtaskmanager/groupmanager.cpp b/libtaskmanager/groupmanager.cpp index afac827f8..05e59ae64 100644 --- a/libtaskmanager/groupmanager.cpp +++ b/libtaskmanager/groupmanager.cpp @@ -1068,7 +1068,7 @@ void GroupManager::setLauncherList(QList launcherList) l.setQuery(QUrlQuery()); - if (addLauncher(l, QIcon(), name, genericName, wmClass)) { + if (addLauncher(l, icon, name, genericName, wmClass)) { urls << l; } }