diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/app/ark_addtoservicemenu.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/app/ark_addtoservicemenu.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/ark/app/ark_addtoservicemenu.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/app/ark_addtoservicemenu.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -18,6 +18,7 @@
 X-KDE-Submenu[ga]=Comhbhrúigh
 X-KDE-Submenu[gl]=Comprimir
 X-KDE-Submenu[hne]=संपीडित करव
+X-KDE-Submenu[hr]=Sabij
 X-KDE-Submenu[hu]=Tömörítés
 X-KDE-Submenu[it]=Comprimi
 X-KDE-Submenu[ja]=圧縮
@@ -57,8 +58,10 @@
 Name[en_GB]=Here
 Name[es]=Aquí
 Name[et]=Siia
+Name[hr]=Ovdje
 Name[is]=Hér
 Name[km]=នៅ​ទីនេះ
+Name[lt]=Čia
 Name[lv]=Šeit
 Name[nb]=Her
 Name[nds]=Hier
@@ -89,7 +92,9 @@
 Name[en_GB]=As ZIP Archive
 Name[es]=Como archivo comprimido ZIP
 Name[et]=ZIP-arhiivina
+Name[hr]=Kao ZIP-arhiva
 Name[km]=ជា​ប័័ណ្ណសារ ZIP
+Name[lt]=ZIP archyvas
 Name[lv]=Kā ZIP arhīvu
 Name[nb]=Som ZIP-arkiv
 Name[nds]=As Zip-Archiev
@@ -120,7 +125,9 @@
 Name[en_GB]=As RAR Archive
 Name[es]=Como archivo comprimido RAR
 Name[et]=RAR-arhiivina
+Name[hr]=Kao RAR-arhiva
 Name[km]=​ជា​ប័ណ្ណសារ RAR
+Name[lt]=RAR archyvas
 Name[lv]=Kā RAR arhīvu
 Name[nb]=Som RAR-arkiv
 Name[nds]=As RAR-Archiev
@@ -151,6 +158,7 @@
 Name[en_GB]=As ZIP/TAR Archive
 Name[es]=Como archivo comprimido ZIP/TAR
 Name[et]=ZIP/TAR-arhiivina
+Name[hr]=Kao ZIP/TAR-arhiva
 Name[km]=ជា​ប័ណ្ណសារ ZIP/TAR
 Name[lv]=Kā ZIP/TAR arhīvu
 Name[nb]=Som ZIP/TAR-arkiv
@@ -182,7 +190,9 @@
 Name[en_GB]=Compress To...
 Name[es]=Comprimir en...
 Name[et]=Paki asukohta...
+Name[hr]=Sabij u …
 Name[km]=បង្ហាប់​ទៅ​ជា​...
+Name[lt]=Suspausti į...
 Name[lv]=Saspiest uz...
 Name[nb]=Komprimer til …
 Name[nds]=Komprimeren as...
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/app/ark.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/app/ark.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/ark/app/ark.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/app/ark.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -23,7 +23,7 @@
 GenericName[gl]=Ferramenta de arquivo
 GenericName[he]=כלי לניהול ארכיונים
 GenericName[hne]=अभिलेखन औजार
-GenericName[hr]=Uslužni program za arhiviranje
+GenericName[hr]=Alat za arhiviranje
 GenericName[hu]=Fájltömörítő
 GenericName[is]=Vinna með safnskrár
 GenericName[it]=Strumento di archiviazione
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/kerfuffle/cliinterface.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/kerfuffle/cliinterface.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/ark/kerfuffle/cliinterface.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/kerfuffle/cliinterface.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -514,7 +514,7 @@
 
     ret = createProcess();
     if (!ret) {
-        error(i18n("Found program '%1', but failed to initalise the process.", program));
+        error(i18n("Found program '%1', but failed to initialize the process.", program));
         return false;
     }
 
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/kerfuffle/kerfufflePlugin.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/kerfuffle/kerfufflePlugin.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/ark/kerfuffle/kerfufflePlugin.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/kerfuffle/kerfufflePlugin.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -19,6 +19,7 @@
 Comment[gl]=Extensión da biblioteca Kerfuffle para manexar formatos de arquivo
 Comment[he]=תוסף לניהול פורמטי ארכיונים לספריית Kerfuffle 
 Comment[hne]=करफुफल लाइब्रेरी बर अभिलेख फारमेट हेंडल करे बर प्लगइन
+Comment[hr]=Priključak za upravljanje arhivnim formatima za biblioteku Kerfuffle
 Comment[hu]=Archívumkezelő modul a Kerfuffle programkönyvtárhoz
 Comment[it]=Plugin per gestire formati di archivio per la libreria Kerfuffle
 Comment[ja]=Kerfuffle ライブラリのアーカイブ形式を扱うプラグイン
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/bk/kerfuffle_bk.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/bk/kerfuffle_bk.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/bk/kerfuffle_bk.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/bk/kerfuffle_bk.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -29,6 +29,7 @@
 Name[gl]=kerfuffle_bk
 Name[he]=kerfuffle_bk
 Name[hne]=करफुफल_बीके
+Name[hr]=kerfuffle_bk
 Name[hu]=kerfuffle_bk
 Name[it]=kerfuffle_bk
 Name[ja]=kerfuffle_bk
@@ -76,6 +77,7 @@
 Comment[gl]=Extensión de bkisofs para Kerfuffle
 Comment[he]=תוסף bkisofs עבור Kerfuffle
 Comment[hne]=करफुफल बर बकिसाफ्स प्लगइन
+Comment[hr]=Priključak bkisofs za Kerfuffle
 Comment[hu]=Bkisofs Kerfuffle-modul
 Comment[it]=Plugin bkisofs per Kerfuffle
 Comment[ja]=Kerfuffle のための bkisofs プラグイン
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/cli7zplugin/kerfuffle_cli7z.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -20,6 +20,7 @@
 Name[es]=Complemento de archivo comprimido 7zip
 Name[et]=7zip arhiivi plugin
 Name[ga]=Breiseán cartlainne 7zip
+Name[hr]=Arhivni priključak 7zip
 Name[ja]=7zip アーカイブ用プラグイン
 Name[km]=កម្មវិធី​ជំនួយ​ប័ណ្ណសារ 7zip
 Name[lt]=7zip archyvo priedas
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/clirarplugin/kerfuffle_clirar.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/clirarplugin/kerfuffle_clirar.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/clirarplugin/kerfuffle_clirar.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/clirarplugin/kerfuffle_clirar.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -20,6 +20,7 @@
 Name[es]=Complemento de archivo comprimido RAR
 Name[et]=RAR-arhiivi plugin
 Name[ga]=Breiseán cartlainne RAR
+Name[hr]=Arhivni priključak RAR
 Name[ja]=RAR アーカイブ用プラグイン
 Name[km]=កម្មវិធី​ជំនួយ​ប័ណ្ណសារ RAR
 Name[lt]=RAR archyvo priedas
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/clizipplugin/kerfuffle_clizip.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/clizipplugin/kerfuffle_clizip.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/clizipplugin/kerfuffle_clizip.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/clizipplugin/kerfuffle_clizip.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -18,7 +18,9 @@
 Name[en_GB]=ZIP archive plugin
 Name[es]=Complemento de archivo comprimido ZIP
 Name[et]=ZIP-arhiivi plugin
+Name[hr]=Arhivni priključak ZIP
 Name[km]=កម្មវិធី​ជំនួយ​ប័ណ្ណសារ ZIP
+Name[lt]=ZIP archyvo priedas
 Name[lv]=ZIP arhīvu spraudnis
 Name[nb]=Programtillegg for ZIP-arkiv
 Name[nds]=Zip-Archievmoduul
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -75,6 +75,7 @@
 Comment[gl]=Extensión de KArchive para Kerfuffle
 Comment[he]=תוסף KArchive  עבור Kerfuffle
 Comment[hne]=करफुफल बर केआर्काइव प्लगइन
+Comment[hr]=Priključak KArchive za Kerfuffle
 Comment[hu]=KArchive Kerfuffle-modul
 Comment[it]=Plugin KArchive per Kerfuffle
 Comment[ja]=Kerfuffle のための KArchive プラグイン
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/debian/changelog /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/debian/changelog
--- kde-nightly-kdeutils-20091006+svn1032120/debian/changelog	2009-10-07 05:14:37.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/debian/changelog	2009-10-10 08:05:11.000000000 +0100
@@ -1,8 +1,8 @@
-kde-nightly-kdeutils (20091006+svn1032120-0neon1) jaunty; urgency=low
+kde-nightly-kdeutils (20091009+svn1033340-0neon1) jaunty; urgency=low
 
   * Nightly Build
 
- -- Project Neon <nightly@getamarok.com>  Wed, 07 Oct 2009 00:14:37 -0400
+ -- Project Neon <nightly@getamarok.com>  Sat, 10 Oct 2009 03:05:11 -0400
 
 kde-nightly-kdeutils (20080303-0amarok1) gutsy; urgency=low
 
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/CMakeLists.txt /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/CMakeLists.txt
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/CMakeLists.txt	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/CMakeLists.txt	2009-10-09 23:30:22.000000000 +0100
@@ -4,7 +4,6 @@
 add_subdirectory( kcmlirc )
 add_subdirectory( irkick )
 add_subdirectory( profiles )
-add_subdirectory( remotes )
 
 
 
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/CMakeLists.txt /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/CMakeLists.txt
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/CMakeLists.txt	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/CMakeLists.txt	2009-10-09 23:30:22.000000000 +0100
@@ -15,7 +15,7 @@
 set(libirkick_common_SRCS
         main.cpp 
         irkick.cpp 
-        klircclient.cpp
+#        klircclient.cpp
 )
 
 
@@ -25,7 +25,7 @@
 
 kde4_add_kdeinit_executable( irkick ${irkick_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_irkick  ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kdelirc_shared)
+target_link_libraries(kdeinit_irkick  ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} solidcontrol kdelirc_shared)
 install(TARGETS kdeinit_irkick ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 target_link_libraries(irkick kdeinit_irkick)
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/irkick.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/irkick.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/irkick.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/irkick.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -44,6 +44,8 @@
 #include <ktoolinvocation.h>
 #include <khelpmenu.h>
 
+using namespace Solid::Control;
+
 IRKick::IRKick():
         KNotificationItem(), npApp(QString())
 {
@@ -55,20 +57,30 @@
     QDBusConnection dBusConnection = QDBusConnection::sessionBus();
     dBusConnection.registerObject("/IRKick", this,
                                   QDBusConnection::ExportAllSlots);
-    theClient = new KLircClient();
 
-    if (! theClient->isConnected()) {
-        QTimer::singleShot(10000, this, SLOT(checkLirc()));
+    
+
+    kDebug() << "loading solid";
+                                  
+    if (!Solid::Control::RemoteControlManager::connected()) {
+        kDebug() << "Lirc not ready yet...";
     }
     theFlashOff = new QTimer(this);
     theFlashOff->setSingleShot(true);
     connect(theFlashOff, SIGNAL(timeout()), SLOT(flashOff()));
 
     theResetCount = 0;
+    resetModes();
     slotReloadConfiguration();
-    connect(theClient, SIGNAL(connectionClosed()), this, SLOT(slotClosed()));
-    connect(theClient, SIGNAL(remotesRead()), this, SLOT(resetModes()));
-    connect(theClient, SIGNAL(commandReceived(const QString &, const QString &, int)), this, SLOT(gotMessage(const QString &, const QString &, int)));
+    connect(RemoteControlManager::notifier(), SIGNAL(statusChanged(bool)), this, SLOT(slotStatusChanged(bool)));
+    foreach(const QString &remote, RemoteControl::allRemoteNames()){
+        RemoteControl *rc = new RemoteControl(remote);
+        kDebug() << "connecting to remote" << remote;
+        connect(rc, 
+                SIGNAL(buttonPressed(const Solid::Control::RemoteControlButton &)), 
+                this, 
+                SLOT(gotMessage(const Solid::Control::RemoteControlButton &)));
+    }
 
     m_menu = new KMenu(associatedWidget());
     setContextMenu(m_menu);
@@ -86,23 +98,25 @@
 {
 }
 
-void IRKick::slotClosed()
+void IRKick::slotStatusChanged(bool connected)
 {
-    KNotification::event("global_event", i18n("The infrared system has severed its connection. Remote controls are no longer available."), SmallIcon("irkick"), associatedWidget());
-    QTimer::singleShot(1000, this, SLOT(checkLirc()));
+  
+    if(connected){
+    KNotification::event("global_event", i18n("A connection to the infrared system has been made. Remote controls may now be available."),
+                SmallIcon("irkick"), associatedWidget());
     updateTray();
-}
-
-void IRKick::checkLirc()
-{
-    if (!theClient->isConnected()) {
-        if (theClient->connectToLirc()) {
-            KNotification::event("global_event", i18n("A connection to the infrared system has been made. Remote controls may now be available."),
-                                 SmallIcon("irkick"), associatedWidget());
-            updateTray();
-        } else {
-            QTimer::singleShot(10000, this, SLOT(checkLirc()));
-        }
+    foreach(const QString &remote, RemoteControl::allRemoteNames()){
+        RemoteControl *rc = new RemoteControl(remote);
+        kDebug() << "connecting to remote" << remote;
+        connect(rc, 
+                SIGNAL(buttonPressed(const Solid::Control::RemoteControlButton &)), 
+                this, 
+                SLOT(gotMessage(const Solid::Control::RemoteControlButton &)));
+    }
+    resetModes();
+    } else {
+      KNotification::event("global_event", i18n("The infrared system has severed its connection. Remote controls are no longer available."), SmallIcon("irkick"), associatedWidget());
+      updateTray();
     }
 }
 
@@ -120,11 +134,11 @@
     }
 
     if (!theResetCount)
-        allModes.generateNulls(theClient->remotes());
+        allModes.generateNulls(Solid::Control::RemoteControl::allRemoteNames());
 
-    const QStringList remotes = theClient->remotes();
-    for (QStringList::const_iterator i = remotes.constBegin(); i != remotes.constEnd(); ++i) {
-        currentModes[*i] = allModes.getDefault(*i).name();
+    foreach (const QString &remote, Solid::Control::RemoteControl::allRemoteNames()) {
+        kDebug() << "adding remote" << remote << "to modes";
+        currentModes[remote] = allModes.getDefault(remote).name();
     }
     updateTray();
     ++theResetCount;
@@ -152,7 +166,7 @@
     QString toolTipHeader = i18n("KDE Lirc Server: ");
     QString toolTip;
     QString icon = "irkick";
-    if (!theClient->isConnected()) {
+    if (!Solid::Control::RemoteControlManager::connected()) {
         toolTipHeader += i18nc("The state of kdelirc", "Stopped");
         toolTip += i18n("Lirc daemon is currently not available.");
         icon = "irkickoff";
@@ -165,7 +179,7 @@
         toolTipHeader += i18nc("The state of kdelirc", "Ready");
         for (QMap<QString, QString>::const_iterator i = currentModes.constBegin(); i != currentModes.constEnd(); ++i) {
             Mode mode = allModes.getMode(i.key(), i.value());
-            toolTip += mode.remoteName() + " <i>(";
+            toolTip += mode.remote() + " <i>(";
             toolTip += mode.name().isEmpty() ? i18n("Master") : mode.name();
             toolTip +=")</i><br>";
         }
@@ -182,7 +196,7 @@
     programs.clear();
 
     if (action.unique()) {
-	QString service = ProfileServer::profileServer()->getServiceName(action.program());
+	QString service = ProfileServer::getInstance()->getServiceName(action.program());
 	if(service.isNull()){
 	    service = action.program();
 	}
@@ -267,7 +281,7 @@
     kDebug() << "programs.size: " << programs.size();
     if (action.autoStart() && !programs.size()) {
         kDebug() << "Should start " << action.program();
-        QString sname = ProfileServer::profileServer()->getServiceName(
+        QString sname = ProfileServer::getInstance()->getServiceName(
                             action.program());
         if (!sname.isNull()) {
             KNotification::event("app_event", i18n("Starting <b>%1</b>...",
@@ -312,40 +326,41 @@
     }
 }
 
-void IRKick::gotMessage(const QString &theRemote, const QString &theButton,
-                        int theRepeatCounter)
+void IRKick::gotMessage(const RemoteControlButton &button)
 {
-    kDebug() << "Got message: " << theRemote << ": " << theButton << " (" << theRepeatCounter << ")";
+    kDebug() << "Got message: " << button.remoteName() << ": " << button.name() << " (" << button.repeatCounter() << ")";
     if (!npApp.isEmpty()) {
         QString theApp = npApp;
         npApp.clear();
         // send notifier by DBUS to npApp/npModule/npMethod(theRemote, theButton);
         kDebug() << "Sending keypress to: " << theApp << ":" << npModule << ":" << npMethod;
-        kDebug() << "Parameters: " << theRemote << theButton;
+        kDebug() << "Parameters: " << button.remoteName() << button.name();
         QDBusMessage m = QDBusMessage::createMethodCall(theApp, npModule, "",
                          npMethod);
-        m << theRemote << theButton;
+        m << button.remoteName() << button.name();
         QDBusMessage response = QDBusConnection::sessionBus().call(m);
         if (response.type() == QDBusMessage::ErrorMessage) {
             kDebug() << response.errorMessage();
         }
     } else {
-        if (currentModes[theRemote].isNull()) currentModes[theRemote] = "";
-        kDebug() << "current mode:" << currentModes[theRemote];
-        IRActions l = allActions.findByModeButton(Mode(theRemote, currentModes[theRemote]), theButton);
-        if (!currentModes[theRemote].isEmpty())
-            l += allActions.findByModeButton(Mode(theRemote, ""), theButton);
+        if (currentModes[button.remoteName()].isNull()) {
+            currentModes[button.remoteName()] = "";
+        }
+        kDebug() << "current mode:" << currentModes[button.remoteName()];
+        IRActions l = allActions.findByModeButton(Mode(button.remoteName(), currentModes[button.remoteName()]), button.name());
+        if (!currentModes[button.remoteName()].isEmpty())
+            l += allActions.findByModeButton(Mode(button.remoteName(), ""), button.name());
         bool doBefore = true, doAfter = false;
         for (int i = 0; i < l.size(); ++i)
-            if (l.at(i)->isModeChange() && !theRepeatCounter) { // mode switch
-                currentModes[theRemote] = l.at(i)->modeChange();
-                Mode mode = allModes.getMode(theRemote, l.at(i)->modeChange());
+            if (l.at(i)->isModeChange() && !button.repeatCounter()) { // mode switch
+                currentModes[button.remoteName()] = l.at(i)->modeChange();
+                Mode mode = allModes.getMode(button.remoteName(), l.at(i)->modeChange());
                 updateTray();
                 doBefore = l.at(i)->doBefore();
                 doAfter = l.at(i)->doAfter();
                 KNotification::event(
-                               "mode_event", "<b>" + mode.remoteName() + ":</b><br>" +
-                               i18n("Mode switched to %1" , currentModes[theRemote] == "" ? i18nc("Default mode in notification", "Default") : currentModes[theRemote]),
+                               "mode_event", "<b>" + mode.remote() + ":</b><br>" +
+                               i18n("Mode switched to %1" , currentModes[button.remoteName()] == "" ? i18nc("Default mode in notification", "Default") : currentModes[button.remoteName()]),
                                DesktopIcon(mode.iconFile().isEmpty() ? "infrared-remote" : mode.iconFile()),
                                associatedWidget());
                 break;
@@ -354,14 +369,14 @@
         for (int after = 0; after < 2; after++) {
             if ((doBefore && !after) || (doAfter && after))
                 for (int i = 0; i < l.size(); ++i) {
-                    if (!l.at(i)->isModeChange() && (l.at(i)->repeat() || !theRepeatCounter)) {
+                    if (!l.at(i)->isModeChange() && (l.at(i)->repeat() || !button.repeatCounter())) {
                         executeAction(*l.at(i));
                     }
                 }
             if (!after && doAfter) {
-                l = allActions.findByModeButton(Mode(theRemote, currentModes[theRemote]), theButton);
-                if (!currentModes[theRemote].isEmpty()) {
-                    l += allActions.findByModeButton(Mode(theRemote, ""), theButton);
+                l = allActions.findByModeButton(Mode(button.remoteName(), currentModes[button.remoteName()]), button.name());
+                if (!currentModes[button.remoteName()].isEmpty()) {
+                    l += allActions.findByModeButton(Mode(button.remoteName(), ""), button.name());
                 }
             }
         }
@@ -370,6 +385,14 @@
     theFlashOff->start(200);
 }
 
+const QStringList IRKick::buttons(QString theRemote) {
+    QStringList retList;
+    foreach(const Solid::Control::RemoteControlButton &button, Solid::Control::RemoteControl(theRemote).buttons()){
+        retList.append(button.name());
+    }
+    return retList;
+}
+
 void IRKick::stealNextPress(QString app, QString module, QString method)
 {
     npApp = app;
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/irkick.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/irkick.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/irkick.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/irkick.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -15,6 +15,7 @@
 Name[fi]=IRKick
 Name[ga]=IRKick
 Name[he]=IRKick
+Name[hr]=IRKick
 Name[is]=IRKick
 Name[kk]=IRKick
 Name[km]=IRKick
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/irkick.h /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/irkick.h
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/irkick.h	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/irkick.h	2009-10-09 23:30:22.000000000 +0100
@@ -28,11 +28,14 @@
 
 #include "modes.h"
 #include "iractions.h"
-#include "klircclient.h"
+//#include "klircclient.h"
 
 #include <knotificationitem.h>
 #include <kaboutdata.h>
 
+#include <solid/control/remotecontrolmanager.h>
+#include <solid/control/remotecontrol.h>
+
 class QTimer;
 
 class IRKick: public KNotificationItem
@@ -54,9 +57,6 @@
     bool searchForProgram(const IRAction &action, QStringList &programs);
     void executeAction(const IRAction &action);
 
-protected:
-    KLircClient *theClient;
-
 public Q_SLOTS: //dbus slot
     /**
      * Query status of connection.
@@ -64,18 +64,7 @@
      * @returns true if connected to lircd.
      */
     bool isConnected() {
-        return theClient->isConnected();
-    }
-
-    /**
-     * Query status of remote list.
-     *
-     * Make sure this is true before calling remotes()/buttons(...).
-     *
-     * @returns true if up to date.
-     */
-    bool haveFullList() {
-        return theClient->haveFullList();
+        return Solid::Control::RemoteControlManager::connected();
     }
 
     /**
@@ -84,7 +73,7 @@
      * @returns said list.
      */
     const QStringList remotes() {
-        return theClient->remotes();
+        return Solid::Control::RemoteControl::allRemoteNames();
     }
 
     /**
@@ -92,12 +81,10 @@
      *
      * @returns said list.
      */
-    const QStringList buttons(QString theRemote) {
-        return theClient->buttons(theRemote);
-    }
+    const QStringList buttons(QString theRemote); 
 
     /**
-     * Sends next keypress to given application by DCOP.
+     * Sends next keypress to given application by DBUS.
      *
      * @param The receiving application.
      * @param The receiving application module.
@@ -118,14 +105,13 @@
     }
 
 private slots:
-    void gotMessage(const QString &theRemote, const QString &theButton, int theRepeatCounter);
+    void gotMessage(const Solid::Control::RemoteControlButton &button);
     void resetModes();
     void flashOff();
-    void checkLirc();
 
     void slotConfigure();
     void slotReloadConfiguration();
-    void slotClosed();
+    void slotStatusChanged(bool connected);
 
 public:
     explicit IRKick();
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/irkick.notifyrc /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/irkick.notifyrc
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/irkick.notifyrc	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/irkick.notifyrc	2009-10-09 23:30:22.000000000 +0100
@@ -7,6 +7,7 @@
 Comment[en_GB]=Irkick
 Comment[es]=Irkick
 Comment[et]=Irkick
+Comment[hr]=Irkick
 Comment[km]=Irkick
 Comment[lv]=Irkick
 Comment[nb]=Irkick
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/klircclient.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/klircclient.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/klircclient.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/klircclient.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,240 +0,0 @@
-/*************************************************************************
- * Copyright            : (C) 2002 by Gav Wood <gav@kde.org>             *
- *                                                                       *
- * This program is free software; you can redistribute it and/or         *
- * modify it under the terms of the GNU General Public License as        *
- * published by the Free Software Foundation; either version 2 of        *
- * the License or (at your option) version 3 or any later version        *
- * accepted by the membership of KDE e.V. (or its successor approved     *
- * by the membership of KDE e.V.), which shall act as a proxy            *
- * defined in Section 14 of version 3 of the license.                    *
- *                                                                       *
- * This program 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 General Public License for more details.                          *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-
-/**
-  * @author Gav Wood
-  */
-
-#include "klircclient.h"
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <cstring>
-#include <sys/un.h>
-#include <sys/socket.h>
-#include <errno.h>
-
-#include <QWidget>
-
-#include <QObject>
-#include <QLocalSocket>
-#include <QFile>
-
-#include <kdebug.h>
-
-KLircClient::KLircClient(QWidget *parent) : QObject(parent), theSocket(0), listIsUpToDate(false)
-{
-	theSocket = 0;
-    connectToLirc();
-}
-
-bool KLircClient::connectToLirc()
-{
-    int sock = ::socket(PF_UNIX, SOCK_STREAM, 0);
-    if (sock == -1) return false;
-
-    sockaddr_un addr;
-    addr.sun_family = AF_UNIX;
-    // Try to open lircd socket for lirc >= 0.8.6
-    strcpy(addr.sun_path, "/var/run/lirc/lircd");
-    if (::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1) {
-        ::close(sock);
-        // for lirc < 0.8.6
-        sock = ::socket(PF_UNIX, SOCK_STREAM, 0);
-        strcpy(addr.sun_path, "/dev/lircd");
-        if (::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1) {
-            ::close(sock);
-            // in case of mandrake...
-            sock = ::socket(PF_UNIX, SOCK_STREAM, 0);
-            strcpy(addr.sun_path, "/tmp/.lircd");
-            if (::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1) {
-                ::close(sock);
-                kDebug() << "no lircd socket found...";
-                return false;
-            } else {
-                kDebug() << "Mandrake lircd socket found...";
-            }
-        } else {
-            kDebug() << "lircd < 0.8.6 socket found...";
-        }
-    } else {
-        kDebug() << "lircd >= 0.8.6 socket found...";
-    }
-    
-    if(!theSocket){
-    	theSocket = new QLocalSocket();
-        connect(theSocket, SIGNAL(readyRead()), SLOT(slotRead()));
-        connect(theSocket, SIGNAL(disconnected()), SLOT(slotClosed()));
-    }
-    theSocket->setSocketDescriptor(sock);
-    updateRemotes();
-    return true;
-}
-
-KLircClient::~KLircClient()
-{
-   delete theSocket;
-}
-
-void KLircClient::slotClosed()
-{
-    emit connectionClosed();
-}
-
-const QStringList KLircClient::remotes() const
-{
-    QStringList remotes;
-    for (QMap<QString, QStringList>::ConstIterator i = theRemotes.constBegin(); i != theRemotes.constEnd(); ++i) {
-        kDebug() << "Remote: " << i.key();
-        remotes.append(i.key());
-    }
-    remotes.sort();
-    return remotes;
-}
-
-const QStringList KLircClient::buttons(const QString &theRemote) const
-{
-    return theRemotes[theRemote];
-}
-
-void KLircClient::slotRead()
-{
-    while (theSocket->bytesAvailable()) {
-        QString line = readLine();
-        if (line == "BEGIN") {
-            // BEGIN
-            // <command>
-            // [SUCCESS|ERROR]
-            // [DATA
-            // n
-            // n lines of data]
-            // END
-            line = readLine();
-            if (line == "SIGHUP") {
-                // Configuration changed
-                do line = readLine();
-                while (!line.isEmpty() && line != "END");
-                updateRemotes();
-                return;
-            } else if (line == "LIST") {
-                // remote control list
-                if (readLine() != "SUCCESS" || readLine() != "DATA") {
-                    do line = readLine();
-                    while (!line.isEmpty() && line != "END");
-                    return;
-                }
-                QStringList remotes;
-                int count = readLine().toInt();
-                for (int i = 0; i < count; ++i)
-                    remotes.append(readLine());
-                do line = readLine();
-                while (!line.isEmpty() && line != "END");
-                if (line.isEmpty())
-                    return; // abort on corrupt data
-                for (QStringList::ConstIterator it = remotes.constBegin(); it != remotes.constEnd(); ++it)
-                    sendCommand("LIST " + *it);
-                return;
-            } else if (line.left(4) == "LIST") {
-                // button list
-                if (readLine() != "SUCCESS" || readLine() != "DATA") {
-                    do line = readLine();
-                    while (!line.isEmpty() && line != "END");
-                    return;
-                }
-                QString remote = line.mid(5);
-                QStringList buttons;
-                int count = readLine().toInt();
-                for (int i = 0; i < count; ++i) {
-                    // <code> <name>
-                    QString btn = readLine().mid(17);
-                    if (btn.isNull()) break;
-                    if (btn.startsWith('\'') && btn.endsWith('\''))
-                        btn = btn.mid(1, btn.length() - 2);
-                    buttons.append(btn);
-                }
-                theRemotes.insert(remote, buttons);
-            }
-            do line = readLine();
-            while (!line.isEmpty() && line != "END");
-            listIsUpToDate = true;
-            kDebug() << "Remotes read!";
-            emit remotesRead();
-        } else {
-            // <code> <repeat> <button name> <remote control name>
-            line.remove(0, 17); // strip code
-            int pos = line.indexOf(' ');
-            if (pos < 0) return;
-            bool ok;
-            int repeat = line.left(pos).toInt(&ok, 16);
-            if (!ok) return;
-            line.remove(0, pos + 1);
-
-            pos = line.indexOf(' ');
-            if (pos < 0) return;
-            QString btn = line.left(pos);
-            if (btn.startsWith('\'') && btn.endsWith('\''))
-                btn = btn.mid(1, btn.length() - 2);
-            line.remove(0, pos + 1);
-            kDebug() << "Command received!";
-            emit commandReceived(line, btn, repeat);
-        }
-    }
-}
-
-void KLircClient::updateRemotes()
-{
-    listIsUpToDate = false;
-    theRemotes.clear();
-    sendCommand("LIST");
-}
-
-bool KLircClient::isConnected() const
-{
-    if (!theSocket) return false;
-    return theSocket->state() == QLocalSocket::ConnectedState;
-}
-
-bool KLircClient::haveFullList() const
-{
-    return listIsUpToDate;
-}
-
-const QString KLircClient::readLine()
-{
-    if (!theSocket->canReadLine()) {
-        theSocket->waitForReadyRead(500);
-        if (!theSocket->canReadLine()) { // Still nothing :(
-            return QString();
-        }
-    }
-    QString line = theSocket->readLine();
-    line.truncate(line.length() - 1);
-    return line;
-}
-
-void KLircClient::sendCommand(const QString &command)
-{
-    QByteArray cmd = QFile::encodeName(command + '\n');;
-    theSocket->write(cmd);
-}
-
-
-#include "klircclient.moc"
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/klircclient.h /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/klircclient.h
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/klircclient.h	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/klircclient.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,127 +0,0 @@
-/*************************************************************************
- * Copyright            : (C) 2002 by Gav Wood <gav@kde.org>             *
- *                                                                       *
- * This program is free software; you can redistribute it and/or         *
- * modify it under the terms of the GNU General Public License as        *
- * published by the Free Software Foundation; either version 2 of        *
- * the License or (at your option) version 3 or any later version        *
- * accepted by the membership of KDE e.V. (or its successor approved     *
- * by the membership of KDE e.V.), which shall act as a proxy            *
- * defined in Section 14 of version 3 of the license.                    *
- *                                                                       *
- * This program 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 General Public License for more details.                          *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-
-/**
-  * @author Gav Wood
-  */
-
-
-#ifndef KLIRCCLIENT_H
-#define KLIRCCLIENT_H
-
-#include <QObject>
-#include <QMap>
-#include <QStringList>
-
-class QLocalSocket;
-class QSocketNotifier;
-
-/**
-@author Malte Starostik
-@author Gav Wood
-*/
-
-class KLircClient: public QObject
-{
-    Q_OBJECT
-
-private:
-    struct lirc_config *theConfig;
-    QLocalSocket *theSocket;
-    QSocketNotifier *theNotifier;
-    QMap<QString, QStringList> theRemotes;
-    bool listIsUpToDate;
-
-    void updateRemotes();
-    void sendCommand(const QString &command);
-    const QString readLine();
-
-private slots:
-    void slotRead();
-    void slotClosed();
-
-signals:
-    /**
-     * Emitted when the list of controls / buttons was completely read
-     */
-    void remotesRead();
-
-    /**
-     * Emitted when a IR command was received
-     *
-     * The arguments are the name of the remote control used,
-     * the name of the button pressed and the repeat counter.
-     *
-     * The signal is emitted repeatedly as long as the button
-     * on the remote control remains pressed.
-     * The repeat counter starts with 0 and increases
-     * every time this signal is emitted.
-     */
-    void commandReceived(const QString &remote, const QString &button, int repeatCounter);
-
-    /**
-     * Emitted when the Lirc connection is closed.
-     */
-    void connectionClosed();
-
-public:
-    /**
-     * Query status of connection.
-     *
-     * @returns true if connected to lircd.
-     */
-    bool isConnected() const;
-
-    /**
-     * Query status of remote list.
-     *
-     * Make sure this is true before calling remotes()/buttons(...).
-     *
-     * @returns true if up to date.
-     */
-    bool haveFullList() const;
-
-    /**
-     * Retrieve list of remote controls.
-     *
-     * @returns said list.
-     */
-    const QStringList remotes() const;
-
-    /**
-     * Retrieve list of buttons of a praticular remote control.
-     *
-     * @returns said list.
-     */
-    const QStringList buttons(const QString &theRemote) const;
-
-    /**
-     * Connects to lirc.
-     *
-     * @returns true if connection is made.
-     */
-    bool connectToLirc();
-
-    KLircClient(QWidget *parent = 0);
-    ~KLircClient();
-};
-
-#endif
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/org.kde.irkick.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/org.kde.irkick.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/irkick/org.kde.irkick.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/irkick/org.kde.irkick.xml	2009-10-09 23:30:22.000000000 +0100
@@ -4,9 +4,6 @@
     <method name="isConnected">
       <arg type="b" direction="out"/>
     </method>
-    <method name="haveFullList">
-      <arg type="b" direction="out"/>
-    </method>
     <method name="remotes">
       <arg type="as" direction="out"/>
     </method>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/addaction.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/addaction.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/addaction.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/addaction.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -26,7 +26,6 @@
 #include "addaction.h"
 #include "prototype.h"
 #include "profileserver.h"
-#include "remoteserver.h"
 #include "mode.h"
 #include "arguments.h"
 #include "iraction.h"
@@ -139,7 +138,7 @@
 	}
 	QString application = theProfiles->currentItem()->data(Qt::UserRole).toString();
 	QString function = theProfileFunctions->currentItem()->data(0, Qt::UserRole).toString();
-	const ProfileAction *profileAction =  ProfileServer::profileServer()->getAction(application, function);
+	const ProfileAction *profileAction =  ProfileServer::getInstance()->getAction(application, function);
 
 	const QList<ProfileActionArgument> &profileActionArguments = profileAction->arguments();
 	kDebug() << "argcount" << profileActionArguments.count();
@@ -171,11 +170,11 @@
 void AddAction::updateButton(const QString &remote, const QString &button)
 {
     if (theMode.remote() == remote) {
-        theButtons->setCurrentItem(theButtons->findItems(RemoteServer::remoteServer()->getButtonName(remote, button), 0).first());
-        theButtons->scrollToItem(theButtons->findItems(RemoteServer::remoteServer()->getButtonName(remote, button), 0).first());
+        theButtons->setCurrentItem(theButtons->findItems(button, 0).first());
+        theButtons->scrollToItem(theButtons->findItems(button, 0).first());
     } else {
         KMessageBox::error(0, i18n("You did not select a mode of that remote control. Please use %1, "
-                                   "or revert back to select a different mode.", theMode.remoteName()),
+                                   "or revert back to select a different mode.", theMode.remote()),
                            i18n("Incorrect Remote Control Detected"));
     }
 }
@@ -185,7 +184,7 @@
     theButtons->clear();
     foreach(const QString &buttonName, DBusInterface::getInstance()->getButtons(theMode.remote())) {
         kDebug() << "foud buttonName " << buttonName;
-        QListWidgetItem *tItem =  new  QListWidgetItem(RemoteServer::remoteServer()->getButtonName(theMode.remote(), buttonName),theButtons);
+        QListWidgetItem *tItem =  new  QListWidgetItem(buttonName,theButtons);
         tItem->setData(Qt::UserRole,buttonName);
 
     }
@@ -244,7 +243,7 @@
 {
     theProfiles->clear();
 
-    foreach (Profile *tmp, ProfileServer::profileServer()->profiles()) {
+    foreach (Profile *tmp, ProfileServer::getInstance()->profiles()) {
         QListWidgetItem *item = new QListWidgetItem(tmp->name());
         item->setData(Qt::UserRole, tmp->id());
         theProfiles->addItem(item);
@@ -255,7 +254,7 @@
 {
     IfMulti im = IM_SENDTOTOP;
     if (theUseProfile->isChecked()) {
-        ProfileServer *theServer = ProfileServer::profileServer();
+        ProfileServer *theServer = ProfileServer::getInstance();
         if (!theProfiles->currentItem()) {
             return;
         }
@@ -293,7 +292,7 @@
 void AddAction::updateProfileFunctions()
 {
     kDebug() << "updateProfileFunctions called";
-    ProfileServer *theServer = ProfileServer::profileServer();
+    ProfileServer *theServer = ProfileServer::getInstance();
     theProfileFunctions->clear();
     if (!theProfiles->currentItem()) {
         return;
@@ -323,7 +322,7 @@
     if (theUseProfile->isChecked()) {
         QString application = theProfiles->currentItem()->data(Qt::UserRole).toString();
         QString function = theProfileFunctions->currentItem()->data(0, Qt::UserRole).toString();
-        const ProfileAction *profileAction =  ProfileServer::profileServer()->getAction(application, function);
+        const ProfileAction *profileAction =  ProfileServer::getInstance()->getAction(application, function);
 
         const QList<ProfileActionArgument> &profileActionArguments = profileAction->arguments();
         for (int i = 0; i < profileActionArguments.count(); ++i) {
@@ -417,7 +416,7 @@
         action->setArguments(getCurrentArgs());
     } else if (theUseProfile->isChecked() && !theProfiles->selectedItems().isEmpty() &&
                (!theProfileFunctions->selectedItems().isEmpty() || theJustStart->isChecked())) {
-        ProfileServer *theServer = ProfileServer::profileServer();
+        ProfileServer *theServer = ProfileServer::getInstance();
 
         if (theNotJustStart->isChecked()) {
             const ProfileAction
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/CMakeLists.txt /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/CMakeLists.txt
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/CMakeLists.txt	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/CMakeLists.txt	2009-10-09 23:30:22.000000000 +0100
@@ -11,7 +11,8 @@
 #link_directories(${KDE4_LIB_DIR} ${CMAKE_CURRENT_BINARY_DIR}  ${CMAKE_BINARY_DIR}/lib)
 ########### next target ###############
 
-set(kcm_lirc_PART_SRCS
+set(kcm_lirc_PART_SRCS 
+   selectprofile.cpp
    kcmlirc.cpp 
    addaction.cpp 
    editmode.cpp 
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/editaction.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/editaction.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/editaction.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/editaction.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -26,7 +26,6 @@
 #include "editaction.h"
 #include "prototype.h"
 #include "profileserver.h"
-#include "remoteserver.h"
 #include "addaction.h"
 #include "dbusinterface.h"
 
@@ -159,10 +158,10 @@
             editActionBaseWidget->theModes->setCurrentIndex(editActionBaseWidget->theModes->findText(theAction->object()));
     } else if (theAction->isJustStart()) { // profile action
         editActionBaseWidget->theUseProfile->setChecked(true);
-        const Profile *p = ProfileServer::profileServer()->getProfileById(theAction->program());
+        const Profile *p = ProfileServer::getInstance()->getProfileById(theAction->program());
         editActionBaseWidget->theApplications->setCurrentIndex(editActionBaseWidget->theApplications->findText(p->name()));
         editActionBaseWidget->theJustStart->setChecked(true);
-    } else if (ProfileServer::profileServer()->getAction(theAction->program(), theAction->object(), theAction->method().prototype())) { // profile action
+    } else if (ProfileServer::getInstance()->getAction(theAction->program(), theAction->object(), theAction->method().prototype())) { // profile action
         editActionBaseWidget->theUseProfile->setChecked(true);
         editActionBaseWidget->thePerformFunction->setChecked(true);
     } else { // DBus action
@@ -187,9 +186,9 @@
     } else if (editActionBaseWidget->theUseProfile->isChecked()) {
         QString application = editActionBaseWidget->theApplications->itemData(editActionBaseWidget->theApplications->currentIndex()).toString();
         QString function = editActionBaseWidget->theFunctions->itemData(editActionBaseWidget->theFunctions->currentIndex()).toString();
-        const ProfileAction *profileAction = ProfileServer::profileServer()->getAction(application, function);
-        if ( profileAction  || (editActionBaseWidget->theJustStart->isChecked() &&  ProfileServer::profileServer()->getProfileById(application))) {
-            tAction->setProgram(ProfileServer::profileServer()->getProfileById(application)->id());
+        const ProfileAction *profileAction = ProfileServer::getInstance()->getAction(application, function);
+        if ( profileAction  || (editActionBaseWidget->theJustStart->isChecked() &&  ProfileServer::getInstance()->getProfileById(application))) {
+            tAction->setProgram(ProfileServer::getInstance()->getProfileById(application)->id());
             if (editActionBaseWidget->theJustStart->isChecked()) {
                 tAction->setObject("");
             } else {
@@ -231,7 +230,7 @@
     if (editActionBaseWidget->theUseProfile->isChecked()) {
         QString function = editActionBaseWidget->theFunctions->itemData(editActionBaseWidget->theFunctions->currentIndex()).toString();
         QString application = editActionBaseWidget->theApplications->itemData(editActionBaseWidget->theApplications->currentIndex()).toString();
-        const ProfileAction *profileAction = ProfileServer::profileServer()->getAction(application, function);
+        const ProfileAction *profileAction = ProfileServer::getInstance()->getAction(application, function);
 
         // No profile action configured or theJustStart is checked... No need for arguments
         if (!profileAction ||  editActionBaseWidget->theJustStart->isChecked()) {
@@ -264,7 +263,7 @@
 
 
         // Check if the current selected function is the configured one
-        if (!ProfileServer::profileServer()->getAction(theAction->program(), theAction->object(), theAction->method().prototype()) &&
+        if (!ProfileServer::getInstance()->getAction(theAction->program(), theAction->object(), theAction->method().prototype()) &&
                 getCurrentDbusApp() == theAction->program() && // The correct app is selected!
                 editActionBaseWidget->theDBusObjects->currentText() == theAction->object() && // And the Object is selected too!
                 getCurrentDBusFunction() == theAction->method().prototype()) { // And also the Function. Fill in the arguments
@@ -291,7 +290,7 @@
 void EditAction::updateInstancesOptions()
 {
     if (editActionBaseWidget->theUseProfile->isChecked()) {
-        ProfileServer *theServer = ProfileServer::profileServer();
+        ProfileServer *theServer = ProfileServer::getInstance();
         if (editActionBaseWidget->theApplications->currentIndex() == -1) return;
         const Profile *p = theServer->getProfileById(editActionBaseWidget->theApplications->itemData(editActionBaseWidget->theApplications->currentIndex()).toString());
         isUnique = p->unique();
@@ -315,12 +314,12 @@
 void EditAction::updateApplications()
 {
     editActionBaseWidget->theApplications->clear();
-    foreach(Profile *tmp, ProfileServer::profileServer()->profiles()) {
+    foreach(Profile *tmp, ProfileServer::getInstance()->profiles()) {
         editActionBaseWidget->theApplications->addItem(tmp->name(), tmp->id());
     }
     editActionBaseWidget->theApplications->model()->sort(0);
 
-    const ProfileAction *profileAction = ProfileServer::profileServer()->getAction(theAction->program(), theAction->object(), theAction->method().prototype());
+    const ProfileAction *profileAction = ProfileServer::getInstance()->getAction(theAction->program(), theAction->object(), theAction->method().prototype());
     if (profileAction) {
         int index = editActionBaseWidget->theApplications->findText(profileAction->profile()->name());
         editActionBaseWidget->theApplications->setCurrentIndex(index < 0 ? 0: index);
@@ -338,12 +337,12 @@
 
     const QString application = editActionBaseWidget->theApplications->itemData(editActionBaseWidget->theApplications->currentIndex()).toString();
     kDebug() << "app:" << application;
-    QHash<QString, ProfileAction*> dict = ProfileServer::profileServer()->getProfileById(application)->actions();
+    QHash<QString, ProfileAction*> dict = ProfileServer::getInstance()->getProfileById(application)->actions();
     QHash<QString, ProfileAction*>::const_iterator i;
     for (i = dict.constBegin(); i != dict.constEnd(); ++i) {
         editActionBaseWidget->theFunctions->addItem(i.value()->name(), i.key());
     }
-    const ProfileAction *action = ProfileServer::profileServer()->getAction(theAction->program(), theAction->object(), theAction->method().prototype());
+    const ProfileAction *action = ProfileServer::getInstance()->getAction(theAction->program(), theAction->object(), theAction->method().prototype());
     if (action && (action->profile()->name() == editActionBaseWidget->theApplications->currentText())) {
         int index = editActionBaseWidget->theFunctions->findText(action->name());
         editActionBaseWidget->theFunctions->setCurrentIndex(index < 0 ? 0 : index);
@@ -361,7 +360,7 @@
         dbusServiceModel->appendRow(new DBusServiceItem(item));
     }
 
-    if (!ProfileServer::profileServer()->getAction(theAction->program(), theAction->object(), theAction->method().prototype()) &&
+    if (!ProfileServer::getInstance()->getAction(theAction->program(), theAction->object(), theAction->method().prototype()) &&
             !DBusInterface::getInstance()->isProgramRunning(theAction->program()) && 
 	    !theAction->isModeChange()) {
         dbusServiceModel->appendRow(new DBusServiceItem(theAction->program()));
@@ -378,7 +377,7 @@
     editActionBaseWidget->theDBusObjects->insertItems(0, DBusInterface::getInstance()->getObjects(getCurrentDbusApp()));
     kDebug() << "Currnet app " << getCurrentDbusApp();
     // Check if configured Action is a DBus Action but not running
-    if (!ProfileServer::profileServer()->getAction(theAction->program(), theAction->object(), theAction->method().prototype()) &&
+    if (!ProfileServer::getInstance()->getAction(theAction->program(), theAction->object(), theAction->method().prototype()) &&
             !DBusInterface::getInstance()->isProgramRunning(theAction->program())) {
         if (editActionBaseWidget->theDBusApplications->itemData(editActionBaseWidget->theDBusApplications->currentIndex()).toString() ==
                 theAction->program()) { // Is selected!
@@ -401,7 +400,7 @@
     }
 
     // Check if configured Action is a DBus Action but not running
-    if (!ProfileServer::profileServer()->getAction(theAction->program(), theAction->object(), theAction->method().prototype()) &&
+    if (!ProfileServer::getInstance()->getAction(theAction->program(), theAction->object(), theAction->method().prototype()) &&
             !DBusInterface::getInstance()->isProgramRunning(theAction->program())) {
         if (editActionBaseWidget->theDBusApplications->itemData(editActionBaseWidget->theDBusApplications->currentIndex()).toString() ==
                 theAction->program()) { // The correct app is selected!
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/editmode.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/editmode.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/editmode.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/editmode.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -35,7 +35,7 @@
     setDefaultButton(Ok);
     setModal(modal);
 
-    editModeBaseWidget->theName->setText(mode.name().isEmpty() ? mode.remoteName() : mode.name());
+    editModeBaseWidget->theName->setText(mode.name().isEmpty() ? mode.remote() : mode.name());
     editModeBaseWidget->theName->setEnabled(! mode.name().isEmpty());
 
     editModeBaseWidget->theIcon->setIconType(KIconLoader::Panel, KIconLoader::Any);
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/kcmlirc.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/kcmlirc.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/kcmlirc.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/kcmlirc.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -28,7 +28,7 @@
 #include "addaction.h"
 #include "newmodedialog.h"
 #include "profileserver.h"
-#include "remoteserver.h"
+
 #include "editaction.h"
 #include "editmode.h"
 #include "dbusinterface.h"
@@ -56,6 +56,7 @@
 
 // typedef KGenericFactory<KCMLirc, QWidget> theFactory;
 // K_EXPORT_COMPONENT_FACTORY(kcm_lirc, theFactory("kcmlirc"))
+#include "selectprofile.h"
 
 K_PLUGIN_FACTORY( KCMLircFactory, registerPlugin<KCMLirc>();)
 K_EXPORT_PLUGIN( KCMLircFactory( "kcm_lirc" ) )
@@ -135,6 +136,8 @@
     connect(theKCMLircBase->theEditMode, SIGNAL(clicked()), this, SLOT(slotEditMode()));
     connect(theKCMLircBase->theRemoveMode, SIGNAL(clicked()), this, SLOT(slotRemoveMode()));
 
+
+
 }
 
 
@@ -145,19 +148,14 @@
 
 void KCMLirc::updateModesStatus()
 {
-    if (!theKCMLircBase->theModes->selectedItems().isEmpty()) {
-        theKCMLircBase->theAddActions->setEnabled(
-            ProfileServer::profileServer()->profiles().count()
-            && RemoteServer::remoteServer()->remotes()[theKCMLircBase->theModes->currentItem()->data(0,Qt::UserRole).value<Mode>().remote()]);
-        theKCMLircBase->theAddAction->setEnabled(
-            theKCMLircBase->theModes->selectedItems().first());
-        theKCMLircBase->theAddMode->setEnabled(
-            theKCMLircBase->theModes->selectedItems().first());
-        theKCMLircBase->theRemoveMode->setEnabled(
-            !theKCMLircBase->theModes->selectedItems().isEmpty()
-            && theKCMLircBase->theModes->selectedItems().first()->parent());
-        theKCMLircBase->theEditMode->setEnabled(
-            theKCMLircBase->theModes->selectedItems().first());
+    if (! theKCMLircBase->theModes->selectedItems().isEmpty()) {
+        QTreeWidgetItem *item = theKCMLircBase->theModes->selectedItems().first();
+        bool remoteSelected = item->isSelected();
+        theKCMLircBase->theAddActions->setEnabled(remoteSelected && ProfileServer::getInstance()->profiles().count());
+        theKCMLircBase->theAddAction->setEnabled(remoteSelected);
+        theKCMLircBase->theAddMode->setEnabled(remoteSelected);
+        theKCMLircBase->theRemoveMode->setEnabled(item->parent() != 0);
+        theKCMLircBase->theEditMode->setEnabled(remoteSelected);
     }
 }
 
@@ -179,8 +177,8 @@
     EditAction theDialog(currentAction(), modeList);
     if (theDialog.exec() == QDialog::Accepted) {
         allActions[allActions.indexOf(currentAction())] = theDialog.getAction();
-        emit changed(true);
         updateActions();
+	emit changed(true);
     }
 }
 
@@ -189,37 +187,21 @@
     if (theKCMLircBase->theModes->selectedItems().isEmpty()) {
         return;
     }
-    Mode m = theKCMLircBase->theModes->currentItem()->data(0, Qt::UserRole).value<Mode>();
-    if (!RemoteServer::remoteServer()->remotes()[m.remote()])
-        return;
-
-    KDialog *theDialog = new KDialog(this);
-    QTreeWidget *theProfiles = new QTreeWidget();
-    theProfiles->setHeaderLabel(i18n("Select a profile"));
-    theProfiles->setRootIsDecorated(false);
-    theDialog->setMainWidget(theProfiles);
-    theDialog->setWindowTitle(i18n("Auto-Populate"));
-
-    QMap<QTreeWidgetItem *, Profile *> profileMap;
-    foreach(Profile *tmp, ProfileServer::profileServer()->profiles()) {
-        QStringList profileList;
-        profileList << tmp->name();
-        profileMap[new QTreeWidgetItem(theProfiles, profileList)] = tmp;
-    }
-
-    if (theDialog->exec() == QDialog::Accepted && theProfiles->currentItem()) {
-        autoPopulate(*(profileMap[theProfiles->currentItem()]),
-                     *(RemoteServer::remoteServer()->remotes()[m.remote()]), m.name());
-        updateActions();
-        emit changed(true);
+    Mode mode = theKCMLircBase->theModes->currentItem()->data(0, Qt::UserRole).value<Mode>();
+     SelectProfile *tDialog = new SelectProfile( mode.remote());
+    if (tDialog->exec() == QDialog::Accepted) {
+      autoPopulate(tDialog->getSelectedProfile(),mode);	
+      updateActions();
+      emit changed(true);
     }
 }
 
 void KCMLirc::slotAddAction()
 {
     kDebug();
-    if (theKCMLircBase->theModes->selectedItems().isEmpty())
+    if (theKCMLircBase->theModes->selectedItems().isEmpty()){
         return;
+    }
     Mode m = theKCMLircBase->theModes->currentItem()->data(0, Qt::UserRole).value<Mode>();
     AddAction theDialog(this, 0, m);
 
@@ -242,7 +224,7 @@
         allActions.addAction(theDialog.getAction());
         updateActions();
         emit changed(true);
-    }
+    }    
 }
 
 void KCMLirc::slotRemoveAction()
@@ -252,18 +234,17 @@
     emit changed(true);
 }
 
-void KCMLirc::autoPopulate(const Profile &profile, const Remote &remote,
-                           const QString &mode)
+void KCMLirc::autoPopulate(const Profile *profile,const Mode &mode)
 {
-    QHash<QString, RemoteButton*> d = remote.buttons();
-    QHash<QString, RemoteButton*>::const_iterator i;
-    for (i = d.constBegin(); i != d.constEnd(); ++i) {
-        const ProfileAction *pa = profile.searchClass(i.value()->getClass());
+    QStringList buttonList = DBusInterface::getInstance()->getButtons(mode.remote());
+
+    foreach (QString button, buttonList ) {
+        const ProfileAction *pa = profile->getProfileActionByButton(button);
         if (pa) {
             IRAction *action = new IRAction();
-            action->setRemote(remote.id());
-            action->setMode(mode);
-            action->setButton(i.value()->id());
+            action->setRemote(mode.remote());
+            action->setMode(mode.name());
+            action->setButton(button);
             action->setRepeat(pa->repeat());
             action->setAutoStart(pa->autoStart());
             action->setProgram(pa->profile()->id());
@@ -271,27 +252,23 @@
             action->setMethod(pa->prototype());
             action->setUnique(pa->profile()->unique());
             action->setIfMulti(pa->profile()->ifMulti());
-            Arguments l;
+            Arguments arguments;
             kDebug() << "Argumentcount" << Prototype(pa->prototype()).argumentCount();
 
             for (int j = 0; j < pa->arguments().size(); ++j) {
-                if (!pa->arguments().at(j).getDefault().toString().isEmpty()) {
-                    l.append(pa->arguments().at(j).getDefault());
-                    l.back().convert(QVariant::nameToType(pa->arguments().at(j).type().toLocal8Bit()));
+                ProfileActionArgument tArgument= pa->arguments().at(j);
+                QVariant tVariant;
+                if (!tArgument.getDefault().toString().isEmpty()) {
+                    tVariant = tArgument.getDefault();
+                    tVariant.convert(QVariant::nameToType(tArgument.type().toLocal8Bit()));
                 } else {
-                    l.append(QString().setNum(i.value()->parameter().toFloat()
-                                              * pa->multiplier()));
-                    l.back().convert(QVariant::nameToType(
-                                         Prototype(pa->prototype()).type(0).toLocal8Bit()));
-
+                    tVariant = QString().setNum(pa->multiplier());
+                    tVariant.convert(QVariant::nameToType(Prototype(pa->prototype()).type(0).toLocal8Bit()));
                 }
-                kDebug() << "added argument: " << l.at(0);
+                arguments.append(tVariant);
+                kDebug() << "added argument: " << tVariant;
             }
-            // argument count should be either 0 or 1. undefined if > 1.
-//            if (Prototype(pa->prototype()).argumentCount() == 1) {
-//                if(pa->theArguments().
-//            }
-            action->setArguments(l);
+            action->setArguments(arguments);
             allActions.addAction(action);
         }
     }
@@ -406,7 +383,7 @@
     }
     theKCMLircBase->theActions->clear();
     Mode m = theKCMLircBase->theModes->currentItem()->data(0, Qt::UserRole).value<Mode>();
-    theKCMLircBase->theModeLabel->setText(m.remoteName() + ": "
+    theKCMLircBase->theModeLabel->setText(m.remote() + ": "
                                           + (m.name().isEmpty() ? i18n("Actions <i>always</i> available") : i18n(
                                                  "Actions available only in mode <b>%1</b>", m.name())));
     IRActions allActionsList = allActions.findByMode(m);
@@ -449,19 +426,11 @@
         }
         QStringList remoteList;
 
-        QString remoteName = RemoteServer::remoteServer()->getRemoteName(*i);
         remoteList << *i;
 
         QFont font = KApplication::font();
         font.setBold(true);
         QFontMetrics fm(font);
-        if (remoteName.compare(*i) != 0) {
-            remoteList << remoteName;
-            if (fm.width(remoteName) + 40 > theKCMLircBase->theModes->columnWidth(0)) {
-                theKCMLircBase->theModes->setColumnWidth(0, fm.width(remoteName) + 40);
-            }
-        }
-
         QFont tFont = QFont();
         tFont.setBold(allModes.isDefault(mode));
         QTreeWidgetItem *remoteTreeWidgetIcon = new QTreeWidgetItem(theKCMLircBase->theModes, remoteList);
@@ -519,24 +488,11 @@
         a->setExpanded(true);
 
         profileMap.clear();
-        foreach(Profile *tmp, ProfileServer::profileServer()->profiles()) {
+        foreach(Profile *tmp, ProfileServer::getInstance()->profiles()) {
             profileMap[new QTreeWidgetItem(a, (QStringList()<< tmp->name()))] = tmp->id();
         }
         a->sortChildren(1, Qt::AscendingOrder);
     }
-    {
-        RemoteServer *theServer = RemoteServer::remoteServer();
-        QTreeWidgetItem *a = new QTreeWidgetItem(theKCMLircBase->theExtensions,
-                (QStringList() << i18n("Remote Controls")));
-        a->setExpanded(true);
-        remoteMap.clear();
-        QHash<QString, Remote*> dict = theServer->remotes();
-        QHash<QString, Remote*>::const_iterator i;
-        for (i = dict.constBegin(); i != dict.constEnd(); ++i) {
-            remoteMap[new QTreeWidgetItem(a, QStringList(i.value()->name()))] = i.key();
-        }
-        a->sortChildren(1, Qt::AscendingOrder);
-    }
     theKCMLircBase->theExtensions->setCurrentItem(theKCMLircBase->theExtensions->topLevelItem(0));
     updateInformation();
 }
@@ -569,7 +525,7 @@
         }
     } else if (theKCMLircBase->theExtensions->selectedItems().first()->parent()->text(
                    0) == i18n("Applications")) {
-        ProfileServer *theServer = ProfileServer::profileServer();
+        ProfileServer *theServer = ProfileServer::getInstance();
         const Profile *p = theServer->getProfileById(profileMap[theKCMLircBase->theExtensions->selectedItems().first()]);
         QStringList infoList;
         infoList << i18n("Extension Name") << p->name();
@@ -586,26 +542,6 @@
         new QTreeWidgetItem(theKCMLircBase->theInformation, infoList);
         theKCMLircBase->theInformationLabel->setText(i18n(
                     "Information on <b>%1</b>:", p->name()));
-    } else if (theKCMLircBase->theExtensions->selectedItems().first()->parent()->text(
-                   0) == i18n("Remote Controls")) {
-        RemoteServer *theServer = RemoteServer::remoteServer();
-        const Remote
-        *p = theServer->remotes()[remoteMap[theKCMLircBase->theExtensions->selectedItems().first()]];
-        QStringList infoList;
-        infoList << i18n("Extension Name") << p->name();
-        new QTreeWidgetItem(theKCMLircBase->theInformation, infoList);
-        infoList.clear();
-        infoList << i18n("Extension Author") << p->author();
-        new QTreeWidgetItem(theKCMLircBase->theInformation, infoList);
-        infoList.clear();
-        infoList << i18n("Remote Control Identifier") << p->id();
-        new QTreeWidgetItem(theKCMLircBase->theInformation, infoList);
-        infoList.clear();
-        infoList << i18n("Number of Buttons") << QString().setNum(
-            p->buttons().count());
-        new QTreeWidgetItem(theKCMLircBase->theInformation, infoList);
-        theKCMLircBase->theInformationLabel->setText(i18n(
-                    "Information on <b>%1</b>:", p->name()));
     }
 }
 
@@ -650,4 +586,27 @@
     emit changed(true);
 }
 
+
+ProfileServer::ProfileSupportedByRemote KCMLirc::isProfileAvailableForRemote(const QString profileName, const QString remoteName)
+{
+    QStringList tProfilActionNames = ProfileServer::getInstance()->getAllButtonNamesById(profileName);
+    if (tProfilActionNames.size() == 0) {
+        return ProfileServer::NO_ACTIONS_DEFINED;
+    }
+    QStringList solidButtonNames = DBusInterface::getInstance()->getButtons(remoteName);
+    int found=0;
+
+    foreach(const QString solidButtonName, solidButtonNames) {
+        if ( tProfilActionNames.contains(solidButtonName)) {
+            found++;
+        }
+    }
+    if (found == 0) {
+        return ProfileServer::NOT_SUPPORTED;
+    } else if (found != tProfilActionNames.size()) {
+        return ProfileServer::PARTIAL_SUPPORTED;
+    }
+    return ProfileServer::FULL_SUPPORTED;
+}
+
 #include "kcmlirc.moc"
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/kcm_lirc.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/kcm_lirc.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/kcm_lirc.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/kcm_lirc.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -78,6 +78,7 @@
 Comment[fa]=برای استفاده با کاربردها، کنترلهای از راه دورتان را پیکربندی کنید
 Comment[fi]=Muokkaa kauko-ohjaimesi toimimaan ohjelmien kanssa
 Comment[he]=הגדרת שלט רחוק לשימוש ביישומים
+Comment[hr]=Podesite vaše udaljene kontrole za upotrebu u aplikacijama
 Comment[is]=Her má stilla fjarstýringar ýmissa forrita
 Comment[kk]=Қашықтан басқаруды қолданбалармен қолдану үшін баптау
 Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​​វត្ថុ​បញ្ជា​ពី​ចម្ងាយ​សម្រាប់​ប្រើជា​មួយ​កម្មវិធី
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/kcmlirc.h /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/kcmlirc.h
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/kcmlirc.h	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/kcmlirc.h	2009-10-09 23:30:22.000000000 +0100
@@ -52,7 +52,7 @@
     Modes allModes;
     QMap<QTreeWidgetItem *, QString> profileMap, remoteMap;
 
-    void autoPopulate(const Profile &profile, const Remote &remote, const QString &mode);
+    void autoPopulate(const Profile *profile, const Mode &mode);
 
     inline IRAction *currentAction() {
         IRAction *tAction = theKCMLircBase->theActions->currentItem()->data(0, Qt::UserRole).value<IRAction*>();
@@ -82,7 +82,7 @@
     virtual void save();
     virtual void defaults();
     virtual void configChanged();
-
+    ProfileServer::ProfileSupportedByRemote isProfileAvailableForRemote(const QString profileName, const QString remoteName);
     explicit KCMLirc(QWidget *parent = 0, const QVariantList &args = QVariantList());
     ~KCMLirc();
 
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/selectprofile.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/selectprofile.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/selectprofile.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/selectprofile.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -0,0 +1,110 @@
+/*
+    Copyright (C) <2009>  <Frank Scheffold (fscheffold@googlemail.com)>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "selectprofile.h"
+#include "dbusinterface.h"
+#include <QTreeWidgetItem>
+#include <klocale.h>
+
+
+SelectProfileWidget::SelectProfileWidget (QWidget *parent) : QWidget(parent) {
+    selectionLabel = new QLabel();
+    profilesWidget = new QTreeWidget();
+    layout = new QVBoxLayout(this);
+    layout->addWidget(new QLabel(i18n("Select profile")));
+    profilesWidget->setHeaderLabel(i18n("Available profiles with button actions"));
+    layout->addWidget(profilesWidget);
+    layout->addWidget(selectionLabel);
+    
+}
+
+SelectProfile::SelectProfile(QString remoteName, QWidget *parent, const bool &modal): KDialog(parent)
+{
+    selectProfileWidget = new SelectProfileWidget;
+
+    setMainWidget(selectProfileWidget);
+    setButtons( Ok | Cancel);
+    setDefaultButton(Ok);
+    setModal(modal);
+    setMainWidget(selectProfileWidget);
+    setWindowTitle(i18n("Auto-Populate"));
+
+    connect(selectProfileWidget->profilesWidget,SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(checkForUpdate(QTreeWidgetItem*,int)));
+    kDebug()<< "remote  " << remoteName;
+    QList<Profile*> profiles = ProfileServer::getInstance()->profiles();
+    QStringList solidButtons = DBusInterface::getInstance()->getButtons(remoteName);
+    foreach(Profile* profile, profiles) {
+        ProfileServer::ProfileSupportedByRemote tSupported = ProfileServer::getInstance()->isProfileAvailableForRemote(profile, solidButtons);
+	  kDebug()<< "support "<< tSupported;
+        if ( tSupported != ProfileServer::NO_ACTIONS_DEFINED) {	
+            ProfileWrapper wrapper = ProfileWrapper(profile, tSupported);
+            QTreeWidgetItem* tTreewidget = new QTreeWidgetItem(selectProfileWidget->profilesWidget,QStringList()<< profile->name());
+            tTreewidget->setData(0,Qt::UserRole,qVariantFromValue<ProfileWrapper>(wrapper));
+            KIcon tIcon;
+            switch (tSupported) {
+            case ProfileServer::FULL_SUPPORTED :
+                tIcon = KIcon("flag-green");
+                break;
+            case ProfileServer::PARTIAL_SUPPORTED :
+                tIcon = KIcon("flag-yellow");
+                break;
+            default:
+                tIcon = KIcon("flag-red");
+            }
+            tTreewidget->setIcon(0, tIcon);
+        }
+    }
+     enableButtonOk(false);
+}
+
+
+
+void SelectProfile::checkForUpdate(QTreeWidgetItem* widgetItem, int col)
+{
+    if (col == -1) {
+        selectProfileWidget->selectionLabel->setText(QString());
+        enableButtonOk(false);
+        return;
+    }
+    ProfileServer::ProfileSupportedByRemote tSupported =  widgetItem->data(0, Qt::UserRole).value<ProfileWrapper>().getSupported();
+
+    switch (tSupported) {
+    case ProfileServer::FULL_SUPPORTED :
+        selectProfileWidget->selectionLabel->setText(i18n("Remote supports all defined buttons in selected profile"));
+        enableButtonOk(true);
+        break;
+    case ProfileServer::PARTIAL_SUPPORTED :
+        selectProfileWidget->selectionLabel->setText(i18n("Remote does not support all defined buttons in selected profile"));
+        enableButtonOk(true);
+        break;
+    case ProfileServer::NOT_SUPPORTED :
+        selectProfileWidget->selectionLabel->setText(i18n("Remote supports none of the defined buttons in selected profile"));
+        enableButtonOk(false);
+        break;
+    default:
+        selectProfileWidget->selectionLabel->setText(QString());
+        enableButtonOk(false);
+    }
+}
+
+
+Profile* SelectProfile::getSelectedProfile()
+{
+    return selectProfileWidget->profilesWidget->currentItem()->data(0, Qt::UserRole).value<ProfileWrapper>().getProfile();
+}
+
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/selectprofile.h /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/selectprofile.h
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kcmlirc/selectprofile.h	1970-01-01 01:00:00.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kcmlirc/selectprofile.h	2009-10-09 23:30:22.000000000 +0100
@@ -0,0 +1,90 @@
+/*
+    Copyright (C) <2009>  <Frank Scheffold (fscheffold@googlemail.com)>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef SELECTPROFILE_H
+#define SELECTPROFILE_H
+
+#include "profileserver.h"
+
+#include <QtGui/QWidget>
+#include <QTreeWidget>
+#include <QLabel>
+#include <QVBoxLayout>
+
+#include <kdialog.h>
+
+class SelectProfileWidget : public QWidget
+{
+private:
+  
+public:
+    QTreeWidget *profilesWidget;
+    QLabel *selectionLabel;
+    QVBoxLayout *layout;
+    
+    SelectProfileWidget (QWidget *parent = 0);
+    
+};
+
+
+class SelectProfile : public KDialog
+{
+    Q_OBJECT
+
+  private:
+    SelectProfileWidget *selectProfileWidget;
+    
+    
+  public:	
+    SelectProfile(QString remoteName, QWidget *parent = 0, const bool &modal = false);
+    Profile *getSelectedProfile();
+    
+  public slots:
+    void checkForUpdate(QTreeWidgetItem*, int);
+};
+
+class ProfileWrapper 
+{
+  private:
+    Profile *profile;
+    ProfileServer::ProfileSupportedByRemote supported;
+  
+  public:
+  ProfileWrapper(){
+  qRegisterMetaType<ProfileWrapper>("ProfileWrapper");
+  };
+    
+    ProfileWrapper( Profile * pProfile, ProfileServer::ProfileSupportedByRemote pSupported){
+      ProfileWrapper();
+      
+      profile = pProfile;
+      supported = pSupported;
+    };
+    
+    Profile *getProfile() {
+      return profile;
+    };
+    
+     ProfileServer::ProfileSupportedByRemote getSupported() {
+      return supported;
+    };
+};
+
+Q_DECLARE_METATYPE(ProfileWrapper)
+
+#endif // SELECTPROFILE_H
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/CMakeLists.txt /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/CMakeLists.txt
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/CMakeLists.txt	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/CMakeLists.txt	2009-10-09 23:30:22.000000000 +0100
@@ -14,8 +14,7 @@
 	modes.cpp 
 	arguments.cpp 
 	mode.cpp 
-	profileserver.cpp 
-	remoteserver.cpp
+	profileserver.cpp 	
 )
 
 kde4_add_library(kdelirc_shared SHARED ${kdelirc_shared_LIB_SRCS})
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/iraction.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/iraction.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/iraction.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/iraction.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -25,7 +25,6 @@
 
 #include "iraction.h"
 #include "profileserver.h"
-#include "remoteserver.h"
 
 #include <QVariant>
 
@@ -116,7 +115,7 @@
 
 KDE_EXPORT const QString IRAction::function() const
 {
-    ProfileServer *theServer = ProfileServer::profileServer();
+    ProfileServer *theServer = ProfileServer::getInstance();
     if (theProgram.isEmpty())
         if (theObject.isEmpty())
             return i18n("Exit mode");
@@ -153,7 +152,7 @@
 
 KDE_EXPORT const QString IRAction::application() const
 {
-    ProfileServer *theServer = ProfileServer::profileServer();
+    ProfileServer *theServer = ProfileServer::getInstance();
     if (theProgram.isEmpty())
         return QString();
     else {
@@ -167,11 +166,11 @@
 
 const QString IRAction::remoteName() const
 {
-    return RemoteServer::remoteServer()->getRemoteName(theRemote);
+    return theRemote;
 }
 
 KDE_EXPORT const QString IRAction::buttonName() const
 {
-    return RemoteServer::remoteServer()->getButtonName(theRemote, theButton);
+    return theButton;
 }
 
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/mode.h /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/mode.h
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/mode.h	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/mode.h	2009-10-09 23:30:22.000000000 +0100
@@ -27,8 +27,7 @@
 #define MODE_H
 
 
-
-#include "remoteserver.h"
+#include <QString>
 
 /**
 @author Gav Wood
@@ -60,9 +59,6 @@
     const QString &iconFile() const {
         return theIconFile;
     }
-    const QString &remoteName() const {
-        return RemoteServer::remoteServer()->getRemoteName(theRemote);
-    }
 
     const Mode &loadFromConfig(KConfig &theConfig, int index);
     void saveToConfig(KConfig &theConfig, int index);
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/profileserver.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/profileserver.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/profileserver.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/profileserver.cpp	2009-10-09 23:30:22.000000000 +0100
@@ -24,7 +24,7 @@
   */
 
 #include "profileserver.h"
-
+//
 #include <QFile>
 
 #include <kglobal.h>
@@ -73,16 +73,21 @@
 // theActions.setAutoDelete(true);
 }
 
-KDE_EXPORT const ProfileAction *Profile::searchClass(const QString &c) const
+KDE_EXPORT Profile::~Profile()
+{
+}
+
+KDE_EXPORT const ProfileAction *Profile::getProfileActionByButton(const QString &c) const
 {
     for (QHash<QString, ProfileAction*>::const_iterator i = theActions.constBegin(); i != theActions.constEnd(); ++i) {
-        if (i.value()->getClass() == c) {
+        if (i.value()->buttonName() == c) {
             return i.value();
         }
     }
     return 0;
 }
 
+
 KDE_EXPORT void Profile::loadFromFile(const QString &fileName)
 {
     charBuffer = "";
@@ -136,8 +141,8 @@
         curPA = new ProfileAction;
         curPA->setObjId(attributes.value("objid"));
         curPA->setPrototype(attributes.value("prototype"));
- kDebug() << "loading function:" << attributes.value("prototype");
-        curPA->setClass(attributes.value("class"));
+        kDebug() << "loading function:" << attributes.value("prototype");
+        curPA->setButtonName(attributes.value("button"));
         curPA->setMultiplier(attributes.value("multiplier").isEmpty() ? 1.0 : attributes.value("multiplier").toFloat());
         curPA->setRepeat(attributes.value("repeat") == "1");
         curPA->setAutoStart(attributes.value("autostart") == "1");
@@ -151,9 +156,9 @@
         curPAA->setType(attributes.value("type"));
         QVariant tmpArg(QVariant::nameToType(attributes.value("type").toLocal8Bit()));
 //        tmpArg.convert();
-	kDebug() << "***********************************";
-	kDebug() << "type:" << attributes.value("type");
-	kDebug() << "tmpArg:" << tmpArg;
+        kDebug() << "***********************************";
+        kDebug() << "type:" << attributes.value("type");
+        kDebug() << "tmpArg:" << tmpArg;
         curPAA->setDefault(tmpArg);
     } else if (name == "range" && curPAA)
         curPAA->setRange(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
@@ -174,21 +179,21 @@
     else if (name == "comment" && curPA && !curPAA)
         curPA->setComment(charBuffer);
     else if (name == "default" && curPA && curPAA) {
-	if (curPAA->theDefault.type() == QVariant::Int) {
-	    curPAA->theDefault.setValue(charBuffer.toInt());
-	} else if (curPAA->theDefault.type() == QVariant::UInt) {
-	    curPAA->theDefault.setValue(charBuffer.toUInt());
-	} else if (curPAA->theDefault.type() == QVariant::Bool) {
-	    curPAA->theDefault.setValue(charBuffer == "true" ? true : false);
-	} else if (curPAA->theDefault.type() == QVariant::Double) {
-	    curPAA->theDefault.setValue(charBuffer.toDouble());
-	} else if (curPAA->theDefault.type() == QVariant::StringList) {
-	    curPAA->theDefault.setValue(charBuffer.split(','));
-	} else if (curPAA->theDefault.type() == QVariant::ByteArray) {
-	    curPAA->theDefault.setValue(charBuffer.toLocal8Bit());
-	} else {
-	    curPAA->theDefault.setValue(charBuffer);
-	}
+        if (curPAA->theDefault.type() == QVariant::Int) {
+            curPAA->theDefault.setValue(charBuffer.toInt());
+        } else if (curPAA->theDefault.type() == QVariant::UInt) {
+            curPAA->theDefault.setValue(charBuffer.toUInt());
+        } else if (curPAA->theDefault.type() == QVariant::Bool) {
+            curPAA->theDefault.setValue(charBuffer == "true" ? true : false);
+        } else if (curPAA->theDefault.type() == QVariant::Double) {
+            curPAA->theDefault.setValue(charBuffer.toDouble());
+        } else if (curPAA->theDefault.type() == QVariant::StringList) {
+            curPAA->theDefault.setValue(charBuffer.split(','));
+        } else if (curPAA->theDefault.type() == QVariant::ByteArray) {
+            curPAA->theDefault.setValue(charBuffer.toLocal8Bit());
+        } else {
+            curPAA->theDefault.setValue(charBuffer);
+        }
 
     } else if (name == "comment" && curPA && curPAA)
         curPAA->setComment(charBuffer);
@@ -202,3 +207,46 @@
     charBuffer = "";
     return true;
 }
+
+
+KDE_EXPORT const QStringList ProfileServer::getAllButtonNamesById(const QString& profileId) const
+{
+    QStringList tReturn;
+    const Profile *profile = getProfileById(profileId);
+    if (profile) {
+        foreach(const ProfileAction *profileAction, profile->actions().values()) {
+            if (! profileAction->buttonName().isEmpty()) {
+                tReturn << profileAction->buttonName();
+            }
+        }
+    }
+    return tReturn;
+}
+
+
+KDE_EXPORT ProfileServer::ProfileSupportedByRemote ProfileServer::isProfileAvailableForRemote(const Profile *profile, const QStringList &solidButtonNames)
+{
+    QStringList tProfilActionNames;
+
+    foreach(const ProfileAction *profileAction, profile->actions().values()) {
+        if (! profileAction->buttonName().isEmpty()) {
+            tProfilActionNames << profileAction->buttonName();
+        }
+    }
+    if (tProfilActionNames.size() == 0) {
+        return ProfileServer::NO_ACTIONS_DEFINED;
+    }
+    int found=0;
+
+    foreach(const QString tProfilActionName, tProfilActionNames) {
+        if ( solidButtonNames.contains(tProfilActionName)) {
+            found++;
+        }
+    }
+    if (found == 0) {
+        return ProfileServer::NOT_SUPPORTED;
+    } else if (found != tProfilActionNames.size()) {
+        return ProfileServer::PARTIAL_SUPPORTED;
+    }
+    return ProfileServer::FULL_SUPPORTED;
+}
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/profileserver.h /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/profileserver.h
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/profileserver.h	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/profileserver.h	2009-10-09 23:30:22.000000000 +0100
@@ -88,12 +88,13 @@
 
 class ProfileAction
 {
-    QString theObjId, thePrototype, theName, theComment, theClass;
+    QString theObjId, thePrototype, theName, theComment, theButtonName;
     float theMultiplier;
     const Profile *parent;
     bool theRepeat, theAutoStart;
     QList<ProfileActionArgument> theArguments;
 
+
     friend class Profile;
 public:
     const QString &objId() const {
@@ -117,15 +118,16 @@
     const QString &comment() const {
         return theComment;
     }
-    void setComment(const QString &a) {
-        theComment = a;
-    }
-    const QString &getClass() const {
-        return theClass;
+
+    const QString &buttonName() const {
+        return theButtonName;
     }
-    void setClass(const QString &a) {
-        theClass = a;
+    void setButtonName(const QString buttonName) {
+        theButtonName  = buttonName;
     }
+    void setComment(const QString &a) {
+        theComment = a;
+    }    
     float multiplier() const {
         return theMultiplier;
     }
@@ -215,11 +217,11 @@
     const QHash<QString, ProfileAction*> &actions() const {
         return theActions;
     }
-    const ProfileAction *searchClass(const QString &c) const;
-
+    const ProfileAction *getProfileActionByButton(const QString &buttonName) const;
     void loadFromFile(const QString &fileName);
 
     Profile();
+    ~Profile();
 };
 
 class ProfileServer
@@ -229,7 +231,13 @@
     QList<Profile*> theProfiles;
 
 public:
-    static ProfileServer *profileServer() {
+    enum ProfileSupportedByRemote {
+        FULL_SUPPORTED,
+        PARTIAL_SUPPORTED,
+        NOT_SUPPORTED,
+        NO_ACTIONS_DEFINED
+    };
+    static ProfileServer *getInstance() {
         if (!theInstance) theInstance = new ProfileServer();
         return theInstance;
     }
@@ -240,7 +248,8 @@
     const ProfileAction *getAction(const QString &appId, const QString &objId, const QString &prototype) const;
     const ProfileAction *getAction(const QString &appId, const QString &actionId) const;
     const QString getServiceName(const QString &appId) const;
-
+    const QStringList getAllButtonNamesById(const QString &profileId) const;
+    ProfileServer::ProfileSupportedByRemote isProfileAvailableForRemote(const Profile *profile, const QStringList &solidButtonNames);
     ProfileServer();
     ~ProfileServer();
 };
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/remoteserver.cpp /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/remoteserver.cpp
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/remoteserver.cpp	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/remoteserver.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,125 +0,0 @@
-/*************************************************************************
- * Copyright            : (C) 2003 by Gav Wood <gav@kde.org>             *
- *                                                                       *
- * This program is free software; you can redistribute it and/or         *
- * modify it under the terms of the GNU General Public License as        *
- * published by the Free Software Foundation; either version 2 of        *
- * the License or (at your option) version 3 or any later version        *
- * accepted by the membership of KDE e.V. (or its successor approved     *
- * by the membership of KDE e.V.), which shall act as a proxy            *
- * defined in Section 14 of version 3 of the license.                    *
- *                                                                       *
- * This program 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 General Public License for more details.                          *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-/**
-  * @author Gav Wood
-  */
-
-#include "remoteserver.h"
-
-#include <QFile>
-
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kdebug.h>
-
-class RemoteServerPrivate
-{
-public:
-     RemoteServer instance;
-};
-
-K_GLOBAL_STATIC(RemoteServerPrivate, theInstancePrivate)
-
-KDE_EXPORT RemoteServer::RemoteServer()
-{
-    loadRemotes();
-}
-
-KDE_EXPORT RemoteServer *RemoteServer::remoteServer() {
-   return &theInstancePrivate->instance;
-}
-
-RemoteServer::~RemoteServer()
-{
-}
-
-void RemoteServer::loadRemotes()
-{
-    const QStringList theFiles = KGlobal::dirs()->findAllResources("data", "remotes/*.remote.xml");
-    for (QStringList::const_iterator i = theFiles.constBegin(); i != theFiles.constEnd(); ++i) {
-        kDebug() << "Found data file: " << *i ;
-        Remote *p = new Remote();
-        p->loadFromFile(*i);
-        theRemotes.insert(p->id(), p);
-    }
-}
-
-Remote::Remote()
-{
-}
-
-Remote::~Remote()
-{
-}
-
-void Remote::loadFromFile(const QString &fileName)
-{
-    charBuffer = "";
-    curRB = 0;
-
-    QFile xmlFile(fileName);
-    QXmlInputSource source(&xmlFile);
-    QXmlSimpleReader reader;
-    reader.setContentHandler(this);
-    reader.parse(source);
-}
-
-bool Remote::characters(const QString &data)
-{
-    charBuffer += data;
-    return true;
-}
-
-bool Remote::startElement(const QString &, const QString &, const QString &name, const QXmlAttributes &attributes)
-{
-    if (name == "remote")
-        theId = theName = attributes.value("id");
-    else if (name == "button") {
-        curRB = new RemoteButton();
-        curRB->setId(attributes.value("id"));
-        curRB->setClass(attributes.value("id"));
-        if (attributes.index("class") > -1)
-            curRB->setClass(attributes.value("class"));
-        curRB->setParameter(attributes.value("parameter"));
-        curRB->setName(attributes.value("id"));
-    }
-
-    charBuffer = "";
-    return true;
-}
-
-bool Remote::endElement(const QString &, const QString &, const QString &name)
-{
-    if (name == "name")
-        if (curRB)
-            curRB->setName(charBuffer);
-        else
-            theName = charBuffer;
-    else if (name == "author")
-        theAuthor = charBuffer;
-    else if (name == "button") {
-        theButtons.insert(curRB->id(), curRB);
-        curRB = 0;
-    }
-
-    charBuffer = "";
-    return true;
-}
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/remoteserver.h /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/remoteserver.h
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/kdelirc/remoteserver.h	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/kdelirc/remoteserver.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-/*************************************************************************
- * Copyright            : (C) 2003 by Gav Wood <gav@kde.org>             *
- *                                                                       *
- * This program is free software; you can redistribute it and/or         *
- * modify it under the terms of the GNU General Public License as        *
- * published by the Free Software Foundation; either version 2 of        *
- * the License or (at your option) version 3 or any later version        *
- * accepted by the membership of KDE e.V. (or its successor approved     *
- * by the membership of KDE e.V.), which shall act as a proxy            *
- * defined in Section 14 of version 3 of the license.                    *
- *                                                                       *
- * This program 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 General Public License for more details.                          *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-
-/**
-  * @author Gav Wood
-  */
-
-#ifndef REMOTESERVER_H
-#define REMOTESERVER_H
-
-
-#include <qxml.h>
-#include <QHash>
-
-#include <kdebug.h>
-
-class RemoteButton
-{
-    QString theName, theId, theClass, theParameter;
-
-    friend class Remote;
-public:
-    void setName(const QString &a) {
-        theName = a;
-    }
-    const QString &name(void) const {
-        return theName;
-    }
-    void setClass(const QString &a) {
-        theClass = a;
-    }
-    const QString &getClass(void) const {
-        return theClass;
-    }
-    void setParameter(const QString &a) {
-        theParameter = a;
-    }
-    const QString &parameter(void) const {
-        return theParameter;
-    }
-    void setId(const QString &a) {
-        theId = a;
-    }
-    const QString &id(void) const {
-        return theId;
-    }
-};
-
-class Remote : public QXmlDefaultHandler
-{
-    QString theName, theId, theAuthor;
-    QHash<QString, RemoteButton*> theButtons;
-
-    QString charBuffer;
-    RemoteButton *curRB;
-
-    friend class RemoteServer;
-public:
-    bool characters(const QString &data);
-    bool startElement(const QString &, const QString &, const QString &name, const QXmlAttributes &attributes);
-    bool endElement(const QString &, const QString &, const QString &name);
-
-    void setName(const QString &a) {
-        theName = a;
-    }
-    const QString &name(void) const {
-        return theName;
-    }
-    void setId(const QString &a) {
-        theId = a;
-    }
-    const QString &id(void) const {
-        return theId;
-    }
-    void setAuthor(const QString &a) {
-        theAuthor = a;
-    }
-    const QString &author(void) const {
-        return theAuthor;
-    }
-    const QHash<QString, RemoteButton*> &buttons() const {
-        return theButtons;
-    }
-
-    void loadFromFile(const QString &fileName);
-
-    const QString &getButtonName(const QString &id) const {
-        if (theButtons[id]) return theButtons[id]->name(); return id;
-    }
-
-    Remote();
-    ~Remote();
-};
-
-
-class RemoteServer
-{
-    static RemoteServer *theInstance;
-    void loadRemotes();
-    QHash<QString, Remote *> theRemotes;
-
-public:
-    static RemoteServer *remoteServer();
-
-    const QHash<QString, Remote*> &remotes() const {
-        return theRemotes;
-    }
-
-    const QString &getRemoteName(const QString &id) const {
-        kDebug() << "Searching for Remote id: " << id;
-        if (theRemotes[id])
-            return theRemotes[id]->name();
-        return id;
-    }
-
-    const QString &getButtonName(const QString &remote, const QString &button) const {
-        if (theRemotes[remote]) return theRemotes[remote]->getButtonName(button); return button;
-    }
-
-    RemoteServer();
-    ~RemoteServer();
-};
-
-#endif
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/amarok.profile.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/amarok.profile.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/amarok.profile.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/amarok.profile.xml	2009-10-09 23:30:22.000000000 +0100
@@ -6,23 +6,23 @@
     <instances unique="1"/>
 
     <!-- Playback actions -->
-    <action objid="Player" prototype="void Play()" class="play">
+    <action objid="Player" prototype="void Play()" button="Play">
         <name>Start playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Stop()" class="stop">
+    <action objid="Player" prototype="void Stop()" button="Stop">
         <name>Stop playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Pause()" class="pause">
+    <action objid="Player" prototype="void Pause()" button="PlayPause">
         <name>Pause playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Next()" class="next">
+    <action objid="Player" prototype="void Next()" button="SkipForward">
         <name>Advance to next track</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Prev()" class="previous">
+    <action objid="Player" prototype="void Prev()"  button ="SkipBackward">
         <name>Go to previous track</name>
         <comment></comment>
     </action>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/dragonplayer.profile.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/dragonplayer.profile.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/dragonplayer.profile.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/dragonplayer.profile.xml	2009-10-09 23:30:22.000000000 +0100
@@ -6,23 +6,23 @@
     <instances unique="0" ifmulti="sendtoone"/>
 
     <!-- Playback actions -->
-    <action objid="Player" prototype="void Play()" class="play">
+    <action objid="Player" prototype="void Play()" button="Play">
         <name>Start playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Stop()" class="stop">
+    <action objid="Player" prototype="void Stop()" button="Stop">
         <name>Stop playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Pause()" class="pause">
+    <action objid="Player" prototype="void Pause()" button="PlayPause">
         <name>Pause playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Next()" class="next">
+    <action objid="Player" prototype="void Next()" button="SkipForward">
         <name>Advance to next track</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Prev()" class="previous">
+    <action objid="Player" prototype="void Prev()"  button="SkipBackward">
         <name>Go to previous track</name>
         <comment></comment>
     </action>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/kmix.profile.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/kmix.profile.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/kmix.profile.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/kmix.profile.xml	2009-10-09 23:30:22.000000000 +0100
@@ -4,7 +4,7 @@
     <name>Sound Mixer</name>
     <author>Michael Zanetti</author>
     <instances unique="1"/>
-    <action objid="Mixer0" prototype="void increaseVolume(QString)" class="volumeup" repeat="1">
+    <action objid="Mixer0" prototype="void increaseVolume(QString)" repeat="1" button="VolumeUp">
         <name>Increase Volume</name>
         <comment></comment>
         <argument type="QString">
@@ -12,7 +12,7 @@
             <default>Master:0</default>
         </argument>
     </action>
-    <action objid="Mixer0" prototype="void decreaseVolume(QString)" class="volumedown" repeat="1">
+    <action objid="Mixer0" prototype="void decreaseVolume(QString)" repeat="1" button="VolumeDown">
         <name>Decrease Volume</name>
         <comment></comment>
         <argument type="QString">
@@ -20,7 +20,7 @@
             <default>Master:0</default>
         </argument>
     </action>
-    <action objid="Mixer0" prototype="void toggleMute(QString)" class="mute">
+    <action objid="Mixer0" prototype="void toggleMute(QString)" button="Mute">
         <name>Toggle Mute</name>
         <comment></comment>
         <argument type="QString">
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/okular.profile.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/okular.profile.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/okular.profile.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/okular.profile.xml	2009-10-09 23:30:22.000000000 +0100
@@ -4,23 +4,23 @@
     <name>Okular</name>
     <author>Pino Toscano</author>
     <instances unique="0" ifmulti="sendtotop"/>
-    <action objid="okular" prototype="void slotPreviousPage()" repeat="0" autostart="0" class="rewind">
+    <action objid="okular" prototype="void slotPreviousPage()" repeat="0" autostart="0" button="Rewind">
         <name>Back</name>
         <comment>Goes to the previous page</comment>
     </action>
-    <action objid="okular" prototype="void slotNextPage()" repeat="0" autostart="0" class="forward">
+    <action objid="okular" prototype="void slotNextPage()" repeat="0" autostart="0" button="FastForward">
         <name>Forward</name>
         <comment>Goes to the next page</comment>
     </action>
-    <action objid="okular" prototype="void slotGotoFirst()" repeat="0" autostart="0" class="previous">
+    <action objid="okular" prototype="void slotGotoFirst()" repeat="0" autostart="0" button="SkipBackward">
         <name>First</name>
         <comment>Goes to the first page</comment>
     </action>
-    <action objid="okular" prototype="void slotGotoLast()" repeat="0" autostart="0" class="next">
+    <action objid="okular" prototype="void slotGotoLast()" repeat="0" autostart="0" button="SkipForward">
         <name>Last</name>
         <comment>Goes to the last page</comment>
     </action>
-    <action objid="okular" prototype="void slotTogglePresentation()" repeat="0" autostart="0" class="play">
+    <action objid="okular" prototype="void slotTogglePresentation()" repeat="0" autostart="0" class="PlayPause">
         <name>Presentation</name>
         <comment>Starts/stops presentation</comment>
     </action>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/profile.dtd /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/profile.dtd
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/profile.dtd	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/profile.dtd	2009-10-09 23:30:22.000000000 +0100
@@ -16,9 +16,10 @@
 <!ATTLIST argument type (int|QString|QCString|QStringList|bool|double) #REQUIRED>
 <!ATTLIST range min CDATA #REQUIRED>
 <!ATTLIST range max CDATA #REQUIRED>
-<!ATTLIST action class (captions|teletext|fullscreen|scan|finetuneup|finetunedown|recall|enter|number|play|stop|pause|record|previous|next|rewind|forward|eject|mute|volumedown|volumeup|channeldown|channelup|red|yellow|green|blue|on|off) #IMPLIED>
+<!ATTLIST action button CDATA>
 <!ATTLIST action multiplier CDATA "1">
 <!ATTLIST action repeat (0|1) "0">
 <!ATTLIST action autostart (0|1) "0">
 <!ATTLIST instances unique (0|1) "1">
 <!ATTLIST instances ifmulti (sendtotop|sendtobottom|sendtoall|dontsend) "dontsend">
+
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/vlc.profile.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/vlc.profile.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/profiles/vlc.profile.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/profiles/vlc.profile.xml	2009-10-09 23:30:22.000000000 +0100
@@ -6,23 +6,23 @@
     <instances unique="0" ifmulti="sendtoone"/>
 
     <!-- Playback actions -->
-    <action objid="Player" prototype="void Play()" class="play">
+    <action objid="Player" prototype="void Play()" button="Play">
         <name>Start playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Stop()" class="stop">
+    <action objid="Player" prototype="void Stop()" button="Stop">
         <name>Stop playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Pause()" class="pause">
+    <action objid="Player" prototype="void Pause()" button="Pause">
         <name>Pause playing</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Next()" class="next">
+    <action objid="Player" prototype="void Next()" button="SkipForward">
         <name>Advance to next track</name>
         <comment></comment>
     </action>
-    <action objid="Player" prototype="void Prev()" class="previous">
+    <action objid="Player" prototype="void Prev()" button="SkipBackward">
         <name>Go to previous track</name>
         <comment></comment>
     </action>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/README.remote-creation /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/README.remote-creation
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/README.remote-creation	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/README.remote-creation	1970-01-01 01:00:00.000000000 +0100
@@ -1,129 +0,0 @@
-How to give your LIRC remote control KDELIRC functionality
-==========================================================
-
-by Gav Wood, 2003.
-
-Introduction
-------------
-
-All LIRC-understandable remote controls automatically function in KDELirc.
-However, to get the advanced (really cool) KDELirc stuff you'll need to create a
-remote.xml file for your remote control. The files are simple and easy to create
-so don't be put off.
-
-The function of the remote.xml file is to describe what the remote controls'
-buttons do in a general manner and to provide free-form text names for them,
-since LIRC only allows non-spaces, non-symbolic charecters in the remote control
-definition files.
-
-When you're finished your remote.xml, you might want to send it to me
-(gav at kde dot org) for inclusion in the distribution of KDELirc. It may soon
-be possible to distribute the remote.xml files along with the lircd.conf files.
-
-Method
-------
-
-a) Start with the basic template and define the LIRC ID of the remote control.
-The LIRC ID is most important, and must be the identifier (look for the line
-"name <...>" after the "begin remote" line). put the text after "name" into "id"
-attribute of the "remote" tag in the "lircd.conf" file ("/etc/lircd.conf").
-   In addition to this, fill in the author and name tags with your name and the
-"nice" name of the remote control. Any extra information you may wish to give it
-(such as alternate names, multimedia bundles/system is comes with etc) may be
-enclosed between optional information tags:
-
-	<?xml version="1.0" ?>
-	<!DOCTYPE remote SYSTEM "remote.dtd">
-
-	<remote id="myremote">
-		<name>My Remote Control</name>
-		<author>Me</author>
-		<information>As bundled with ACME LinTV</information>
-	</remote>
-
-This would compliment a "lircd.conf" file:
-
-	begin remote
-	  name myremote
-	  ...
-	end remote
-
-b) With the hard work out of the way, just start going though each button on the
-remote control. For each button, make sure the "id" attribute is the same as in
-the lircd.conf file.
-   For each (common) button, you might also want to specify the class, which will
-help KDELirc match it to any application's action. For a list of all button
-classes, look in the remote.dtd file which comes with KDELirc. If the class type
-is one which encompasses many buttons, for example "number", then you should also
-specify which number it is in the parameter attribute. Currently, this only
-actually applies to "number" - all other classes are simple and do not require a
-parameter attribute.
-   Note: If no "class" is given, it will default to the "id". In the unlikely
-case that this is not what you want, simply define it to be null (class="").
-
-	<?xml version="1.0" ?>
-	<!DOCTYPE remote SYSTEM "remote.dtd">
-
-	<remote id="myremote">
-		<name>My Remote Control</name>
-		<author>Me</author>
-		<button id="num0" class="number" parameter="0">
-		</button>
-		<button id="rec" class="record">
-		</button>
-	</remote>
-
-This would compliment a "lircd.conf" file:
-
-	begin remote
-	  name myremote
-	  ...
-	  begin raw_codes
-	    name num0
-	    ...
-	    name rec
-	    ...
-	  end raw_codes
-	end remote
-
-c) The last thing to define in each of your buttons is the "nice" name. This may
-be descriptive and use spaces, symbols and mixed case text, in a similar fashion
-to the remote control's name. There is no need to copy the remote control's label
-verbatim. If necessary expand the description to provide a readable, aethetically
-pleasing label e.g. you should name the "CC" button "Closed Captions" or the "Rec"
-button "Record".
-
-	<?xml version="1.0" ?>
-	<!DOCTYPE remote SYSTEM "remote.dtd">
-
-	<remote id="myremote">
-		<name>My Remote Control</name>
-		<author>Me</author>
-		<button id="num0" class="number" parameter="0">
-			<name>0</name>
-		</button>
-		<button id="rec" class="record">
-			<name>Record</name>
-		</button>
-	</remote>
-
-   Note: The name of a button will automatically default to its "id", so you can
-save yourself some time and effort with buttons which share the same name and id
-by changing
-
-		<button id="num0" class="number" parameter="0">
-			<name>0</name>
-		</button>
-
-to the far less cluttered and simpler:
-
-		<button id="num0" class="number" parameter="0"/>
-
-That's it - just save it as <id>.remote.xml, where <id> is the ID of the remote
-control (*not* its name but the LIRC id!) and copy it to your KDE remotes data
-directory (~/.kde/share/apps/remotes).
-
-   You'll probably need to restart control center before the remote definition
-is recognised.
-
-Gav Wood <gav at kde dot org>
\ No newline at end of file
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/AppleRemote.remote.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/AppleRemote.remote.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/AppleRemote.remote.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/AppleRemote.remote.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE remote SYSTEM "remote.dtd">
-
-<remote id="Apple_A1156">
-	<name>Apple Remote</name>
-	<author>Michael Zanetti</author>
-	<information>Bundled with all Intel powered Apple Computers and some late MacMini PPC models</information>
-	<button id="MENU" class="enter"><name>Menu</name></button>
-	<button id="PLAY" class="play"><name>Play</name></button>
-	<button id="VOLUP" class="volumeup"><name>Volume Up</name></button>
-	<button id="VOLDOWN" class="volumedown"><name>Volume Down</name></button>
-	<button id="BACKWARD" class="previous"><name>Rewind</name></button>
-	<button id="FORWARD" class="next"><name>Forward</name></button>
-	
-</remote>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/AsusDH.remote.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/AsusDH.remote.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/AsusDH.remote.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/AsusDH.remote.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE remote SYSTEM "remote.dtd">
-
-<remote id="AsusDH">
-        <name>Asus Digital Home</name>
-        <author>Gioacchino Mazzurco [gmazzurco89@gmail.com]</author>
-        <information>Bundled with all Asus Digital Home motherboard series</information>
-        <button id="POWER" class="off"><name>Power off</name></button>
-        <button id="QUICK_POWER" class="on"><name>Quick Power</name></button>
-        <button id="NOISE_OFF"><name>Noise off</name></button>
-        <button id="WIFI"><name>Wi Fi</name></button>
-        <button id="AP_LAUNCH"><name>Launch app</name></button>
-        <button id="MAXIMIZE"><name>Maximize</name></button>
-        <button id="PLUS" class="volumeup"><name>Volume +</name></button>
-        <button id="REV" class="rev"><name>Previous</name></button>
-        <button id="PLAY/PAUSE" class="play"><name>Play / Pause</name></button>
-        <button id="FWD" class="forward"><name>Next</name></button>
-        <button id="MINUS" class="volumedown"><name>Volume -</name></button>
-</remote>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/cimr100.remote.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/cimr100.remote.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/cimr100.remote.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/cimr100.remote.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE remote SYSTEM "remote.dtd">
-
-<remote id="cimr100">
-	<name>Creative CIMR-100</name>
-	<author>Gav Wood</author>
-	<button id="0" class="number" parameter="0"/>
-	<button id="1" class="number" parameter="1"/>
-	<button id="2" class="number" parameter="2"/>
-	<button id="3" class="number" parameter="3"/>
-	<button id="4" class="number" parameter="4"/>
-	<button id="5" class="number" parameter="5"/>
-	<button id="6" class="number" parameter="6"/>
-	<button id="7" class="number" parameter="7"/>
-	<button id="8" class="number" parameter="8"/>
-	<button id="9" class="number" parameter="9"/>
-	<button id="back" class="previous"><name>Back</name></button>
-	<button id="eject" class="eject"><name>Eject</name></button>
-	<button id="fastforward" class="forward"><name>Fast Forward</name></button>
-	<button id="mouse"><name>Mouse</name></button>
-	<button id="mute" class="mute"><name>Mute</name></button>
-	<button id="pause" class="pause"><name>Pause</name></button>
-	<button id="play" class="play"><name>Play</name></button>
-	<button id="next" class="next"><name>Next</name></button>
-	<button id="rewind" class="rewind"><name>Rewind</name></button>
-	<button id="shift"><name>Shift</name></button>
-	<button id="start"><name>Start</name></button>
-	<button id="stop" class="stop"><name>Stop</name></button>
-	<button id="voldown" class="volumedown"><name>Volume Down</name></button>
-	<button id="volup" class="volumeup"><name>Volume Up</name></button>
-</remote>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/CMakeLists.txt /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/CMakeLists.txt
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/CMakeLists.txt	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-
-
-
-
-########### install files ###############
-
-install( FILES
-	AppleRemote.remote.xml
-	RM-0010.remote.xml
-	cimr100.remote.xml
-	sherwood.remote.xml
-	hauppauge.remote.xml
-	sonytv.remote.xml
-	AsusDH.remote.xml
-	packbell.remote.xml
-	remote.dtd 
-	DESTINATION ${DATA_INSTALL_DIR}/remotes)
-
-
-
-
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/hauppauge.remote.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/hauppauge.remote.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/hauppauge.remote.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/hauppauge.remote.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE remote SYSTEM "remote.dtd">
-
-<remote id="Hauppauge">
-	<name>Hauppauge</name>
-	<author>Dirk Ziegelmeier</author>
-	<information>Bundled with WinTV PCI, PVR</information>
-	<button id="0" class="number" parameter="0"/>
-	<button id="1" class="number" parameter="1"/>
-	<button id="2" class="number" parameter="2"/>
-	<button id="3" class="number" parameter="3"/>
-	<button id="4" class="number" parameter="4"/>
-	<button id="5" class="number" parameter="5"/>
-	<button id="6" class="number" parameter="6"/>
-	<button id="7" class="number" parameter="7"/>
-	<button id="8" class="number" parameter="8"/>
-	<button id="9" class="number" parameter="9"/>
-	<button id="TV"><name>TV</name></button>
-	<button id="RADIO"><name>Radio</name></button>
-	<button id="CH-" class="channeldown"><name>Channel Down</name></button>
-	<button id="CH+" class="channelup"><name>Channel Up</name></button>
-	<button id="VOL-" class="volumedown"><name>Volume Down</name></button>
-	<button id="VOL+" class="volumeup"><name>Volume Up</name></button>
-	<button id="MUTE" class="mute"><name>Mute</name></button>
-	<button id="SOURCE"><name>Source</name></button>
-	<button id="FULL_SCREEN" class="fullscreen"><name>Fullscreen</name></button>
-	<button id="RESERVED"><name>Reserved</name></button>
-	<button id="MINIMIZE"><name>Minimize</name></button>
-</remote>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/packbell.remote.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/packbell.remote.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/packbell.remote.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/packbell.remote.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE remote SYSTEM "remote.dtd">
-
-<remote id="PackBell">
-	<name>Packbell Remote Control</name>
-	<author>Frank Scheffold</author>
-	
-	<button id="Help"><name>Help</name></button>
-	<button id="Phone"><name>Phone</name></button>
-	<button id="Message"><name>Message</name></button>
-	<button id="SRS"><name>SRS</name></button>
-	
-	<button id="CD"><name>Input CD</name></button>
-	<button id="Aux1"><name>Input Aux1</name></button>
-	<button id="Aux2"><name>Input Aux2</name></button>
-	<button id="Aux3"><name>Input Aux3</name></button>
-	
-	<button id="Up" class="play"><name>Up</name></button>	
-	<button id="Down" class="stop"><name>Down</name></button>
-	<button id="Left" class="previous"><name>Left</name></button>
-	<button id="Right" class="next"><name>Right</name></button>	
-	<button id="RMB" class="forward"><name>Right mouse button</name></button>
-	<button id="LMB" class="rewind"><name>Left mouse button</name></button>
-	
-	<button id="Menu"><name>Menu</name></button>
-	<button id="Enter" class="enter"><name>Enter</name></button>
-	<button id="Display" class="fullscreen"><name>Display</name></button>
-	<button id="Mute" class="mute"><name>Mute</name></button>
-	<button id="CHUp" class="channelup"><name>Chanel Up</name></button>
-	<button id="CHDown" class="channeldown"><name>Chanel Down</name></button>
-	<button id="VolUp" class="volumeup"><name>Volume Up</name></button>
-	<button id="VolDown" class="volumedown"><name>Volume Down</name></button>
-	
-	<button id="00" class="number" parameter="0"><name>0</name></button>
-	<button id="01" class="number" parameter="1"><name>1</name></button>
-	<button id="02" class="number" parameter="2"><name>2</name></button>
-	<button id="03" class="number" parameter="3"><name>3</name></button>
-	<button id="04" class="number" parameter="4"><name>4</name></button>
-	<button id="05" class="number" parameter="5"><name>5</name></button>
-	<button id="06" class="number" parameter="6"><name>6</name></button>
-	<button id="07" class="number" parameter="7"><name>7</name></button>
-	<button id="08" class="number" parameter="8"><name>8</name></button>
-	<button id="09" class="number" parameter="9"><name>9</name></button>	
-	<button id="Star"><name>Star</name></button>
-	<button id="Hash"><name>Hash</name></button>
-</remote>
\ No newline at end of file
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/remote.dtd /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/remote.dtd
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/remote.dtd	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/remote.dtd	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-<!--
-<!DOCTYPE remote SYSTEM "remote.dtd">
--->
-
-<!ELEMENT remote (name, author, information?, button+)>
-<!ELEMENT button (name?)>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-<!ELEMENT information (#PCDATA)>
-
-<!ATTLIST remote id CDATA #REQUIRED>
-<!ATTLIST button id CDATA #REQUIRED>
-<!ATTLIST button class (captions|teletext|fullscreen|scan|finetuneup|finetunedown|recall|enter|number|play|stop|pause|record|previous|next|rewind|forward|eject|mute|volumedown|volumeup|channeldown|channelup|red|yellow|green|blue|on|off) #IMPLIED>
-<!ATTLIST button option (0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20) #IMPLIED>
-<!ATTLIST button parameter CDATA #IMPLIED>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/RM-0010.remote.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/RM-0010.remote.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/RM-0010.remote.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/RM-0010.remote.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE remote SYSTEM "remote.dtd">
-
-<remote id="RM-0010">
-	<name>Leadtek CoolCommand RM-0010</name>
-	<author>Zsolt Rizsanyi</author>
-	<button id="0" class="number" parameter="0"/>
-	<button id="1" class="number" parameter="1"/>
-	<button id="2" class="number" parameter="2"/>
-	<button id="3" class="number" parameter="3"/>
-	<button id="4" class="number" parameter="4"/>
-	<button id="5" class="number" parameter="5"/>
-	<button id="6" class="number" parameter="6"/>
-	<button id="7" class="number" parameter="7"/>
-	<button id="8" class="number" parameter="8"/>
-	<button id="9" class="number" parameter="9"/>
-	<button id="POWER" class="off"><name>Power</name></button>
-	<button id="TV/FM"><name>TV/FM</name></button>
-	<button id="SCAN" class="scan"><name>Scan</name></button>
-	<button id="DISPLAY"><name>Display</name></button>
-	<button id="RECALL" class="recall"><name>Recall</name></button>
-	<button id="ENTER" class="enter"><name>Enter</name></button>
-	<button id="CC" class="captions"><name>Closed Captions</name></button>
-	<button id="MTS"><name>MTS</name></button>
-	<button id="FINE_DOWN" class="finetunedown"><name>Fine Tune Down</name></button>
-	<button id="FINE_UP" class="finetuneup"><name>Fine Tune Up</name></button>
-	<button id="VIDEO"><name>Video</name></button>
-	<button id="MUTE" class="mute"><name>Mute</name></button>
-	<button id="CH_UP" class="channelup"><name>Channel Up</name></button>
-	<button id="CH_DOWN" class="channeldown"><name>Channel Down</name></button>
-	<button id="VOL_UP" class="volumeup"><name>Volume Up</name></button>
-	<button id="VOL_DOWN" class="volumedown"><name>Volume Down</name></button>
-	<button id="FULLSCREEN" class="fullscreen"><name>Full Screen</name></button>
-	<button id="SLEEP"><name>Sleep</name></button>
-	<button id="BOSS_KEY"><name>Boss key</name></button>
-	<button id="RED" class="red"><name>Red</name></button>
-	<button id="GREEN" class="green"><name>Green</name></button>
-	<button id="YELLOW" class="yellow"><name>Yellow</name></button>
-	<button id="BLUE" class="blue"><name>Blue</name></button>
-	<button id="PIP"><name>Pip</name></button>
-	<button id="."><name>Dot (.)</name></button>
-	<button id="BACK" class="previous"><name>Back</name></button>
-	<button id="PLAY" class="play"><name>Play</name></button>
-	<button id="NEXT" class="next"><name>Next</name></button>
-	<button id="TIMESHIFT"><name>Timeshift</name></button>
-	<button id="STOP" class="stop"><name>Stop</name></button>
-	<button id="REC" class="record"><name>Record</name></button>
-	<button id="SNAPSHOT"><name>Snapshot</name></button>
-</remote>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/sherwood.remote.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/sherwood.remote.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/sherwood.remote.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/sherwood.remote.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE remote SYSTEM "remote.dtd">
-
-<remote id="sherwood">
-	<name>Sherwood RM-RD-61</name>
-	<author>Gav Wood</author>
-	<button id="0" class="number" parameter="0"/>
-	<button id="1" class="number" parameter="1"/>
-	<button id="2" class="number" parameter="2"/>
-	<button id="3" class="number" parameter="3"/>
-	<button id="4" class="number" parameter="4"/>
-	<button id="5" class="number" parameter="5"/>
-	<button id="6" class="number" parameter="6"/>
-	<button id="7" class="number" parameter="7"/>
-	<button id="8" class="number" parameter="8"/>
-	<button id="9" class="number" parameter="9"/>
-	<button id="6chdirect"><name>Input - 6 Channel Direct</name></button>
-	<button id="adjust"><name>Adjust</name></button>
-	<button id="auto"><name>Auto</name></button>
-	<button id="aux"><name>Input - Aux</name></button>
-	<button id="cd"><name>Input - CD</name></button>
-	<button id="chdown" class="channeldown"><name>Channel Down</name></button>
-	<button id="chup" class="channelup"><name>Channel Up</name></button>
-	<button id="chsel"><name>Channel Select</name></button>
-	<button id="decka"><name>Deck A Select</name></button>
-	<button id="deckb"><name>Deck B Select</name></button>
-	<button id="deckforward"><name>Deck - Forward</name></button>
-	<button id="deckpause"><name>Deck - Pause</name></button>
-	<button id="deckplay"><name>Deck - Play</name></button>
-	<button id="deckplayback"><name>Deck - Play Reverse</name></button>
-	<button id="deckrecord"><name>Deck - Record</name></button>
-	<button id="deckrewind"><name>Deck - Rewind</name></button>
-	<button id="deckstop"><name>Deck - Stop</name></button>
-	<button id="display"><name>Equalizer - Display</name></button>
-	<button id="displaysys"><name>System Display</name></button>
-	<button id="dspmode"><name>DSP Mode</name></button>
-	<button id="dtime"><name>Date Time</name></button>
-	<button id="file"><name>Equalizer - File</name></button>
-	<button id="masterdown"><name>Master Down</name></button>
-	<button id="masterup"><name>Master Up</name></button>
-	<button id="mute"><name>Mute</name></button>
-	<button id="preset"><name>Equalizer - Preset</name></button>
-	<button id="sleep"><name>Sleep</name></button>
-	<button id="stereo"><name>Stereo</name></button>
-	<button id="tapemon"><name>Input - Tape Monitor</name></button>
-	<button id="tmon"><name>Equalizer - Monitor</name></button>
-	<button id="ttone"><name>Test Tone</name></button>
-	<button id="tuner"><name>Input - Tuner</name></button>
-	<button id="user"><name>Equalizer - User</name></button>
-	<button id="video1"><name>Input - Video 1</name></button>
-	<button id="video2"><name>Input - Video 2</name></button>
-	<button id="video3"><name>Input - Video 3</name></button>
-	<button id="disc" class="eject"><name>CD Select</name></button>
-	<button id="discplay" class="play"><name>CD - Play</name></button>
-	<button id="discstop" class="stop"><name>CD - Stop</name></button>
-	<button id="discback" class="previous"><name>CD - Back</name></button>
-	<button id="discnext" class="next"><name>CD - Next</name></button>
-	<button id="discpause" class="pause"><name>CD - Pause</name></button>
-	<button id="discrepeat"><name>CD - Repeat</name></button>
-	<button id="discintro"><name>CD - Intro</name></button>
-</remote>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/sonytv.remote.xml /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/sonytv.remote.xml
--- kde-nightly-kdeutils-20091006+svn1032120/kdelirc/remotes/sonytv.remote.xml	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kdelirc/remotes/sonytv.remote.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE remote SYSTEM "remote.dtd">
-
-<remote id="SONY-TV">
-	<name>SonyTV</name>
-	<author>Dirk Ziegelmeier</author>
-	<information>Bundled with some Sony TVs</information>
-	<button id="0" class="number" parameter="0"/>
-	<button id="1" class="number" parameter="1"/>
-	<button id="2" class="number" parameter="2"/>
-	<button id="3" class="number" parameter="3"/>
-	<button id="4" class="number" parameter="4"/>
-	<button id="5" class="number" parameter="5"/>
-	<button id="6" class="number" parameter="6"/>
-	<button id="7" class="number" parameter="7"/>
-	<button id="8" class="number" parameter="8"/>
-	<button id="9" class="number" parameter="9"/>
-	<button id="TV"><name>TV</name></button>
-	<button id="CHANNELDOWN" class="channeldown"><name>Channel Down</name></button>
-	<button id="CHANNELUP" class="channelup"><name>Channel Up</name></button>
-	<button id="VOLUMEDOWN" class="volumedown"><name>Volume Down</name></button>
-	<button id="VOLUMEUP" class="volumeup"><name>Volume Up</name></button>
-	<button id="MUTE" class="mute"><name>Mute</name></button>
-	<button id="EXT"><name>EXT</name></button>
-	<button id="-/--"><name>-/--</name></button>
-	<button id="RED"><name>Red</name></button>
-	<button id="YELLOW"><name>Yellow</name></button>
-	<button id="BLUE"><name>Blue</name></button>
-	<button id="GREEN"><name>Green</name></button>
-</remote>
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kgpg/encryptfile.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kgpg/encryptfile.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kgpg/encryptfile.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kgpg/encryptfile.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -27,6 +27,7 @@
 Name[gl]=Cifrar o ficheiro
 Name[he]=הצפן קובץ
 Name[hne]=फाइल एनक्रिप्ट करव
+Name[hr]=Kriptiraj datoteku
 Name[hu]=Fájl titkosítása
 Name[is]=Dulrita skrá
 Name[it]=Cifratura file
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kgpg/encryptfolder.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kgpg/encryptfolder.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kgpg/encryptfolder.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kgpg/encryptfolder.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -24,6 +24,7 @@
 Name[gl]=Arquivar e cifrar o cartafol
 Name[he]=כלי להצפנה וכיווץ תקייה
 Name[hne]=फोल्डर ल एनक्रिप्ट अउ अभिलेखित करव
+Name[hr]=Arhiviraj i kriptiraj mapu
 Name[hu]=Könyvtár titkosítása és archiválása
 Name[is]=Pakka og dulrita möppu
 Name[it]=Archivia e cifra cartella
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kgpg/kgpg.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kgpg/kgpg.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kgpg/kgpg.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kgpg/kgpg.desktop	2009-10-09 23:30:22.000000000 +0100
@@ -27,6 +27,7 @@
 GenericName[gl]=Ferramenta de cifraxe
 GenericName[he]=כלי הצפנה
 GenericName[hne]=एनक्रिप्सन औजार
+GenericName[hr]=Alat za kriptiranje
 GenericName[hu]=Titkosítóeszköz
 GenericName[is]=Dulritunartól
 GenericName[it]=Strumento di crittografia
@@ -141,6 +142,7 @@
 Name[gl]=KGpg
 Name[he]=KGpg
 Name[hne]=के-जीपीजी
+Name[hr]=KGpg
 Name[hu]=KGpg
 Name[is]=KGpg
 Name[it]=KGpg
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kwallet/konfigurator/kwalletconfig.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kwallet/konfigurator/kwalletconfig.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kwallet/konfigurator/kwalletconfig.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kwallet/konfigurator/kwalletconfig.desktop	2009-10-09 23:30:23.000000000 +0100
@@ -32,6 +32,7 @@
 Name[gl]=KDE Wallet
 Name[he]=KDE Wallet
 Name[hne]=केडीई वालेट
+Name[hr]=KDE-ov novčanik
 Name[hu]=Digitális noteszek
 Name[is]=KDE veskið
 Name[it]=Portafogli di KDE
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kwallet/konfigurator/kwalletmanager_show.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kwallet/konfigurator/kwalletmanager_show.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kwallet/konfigurator/kwalletmanager_show.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kwallet/konfigurator/kwalletmanager_show.desktop	2009-10-09 23:30:23.000000000 +0100
@@ -21,6 +21,7 @@
 Name[gl]=Ferramenta de xestión de carteiras
 Name[he]=כלי לניהול הארנק של KDE
 Name[hne]=बटुआ प्रबंधन औजार
+Name[hr]=Alat za upravljanje novčanikom
 Name[hu]=Kezelőprogram a KDE digitális noteszeihez
 Name[is]=Tól til að stýra eiginleikum veskisins
 Name[it]=Strumento per la gestione dei portafogli
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kwallet/kwalletmanager.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kwallet/kwalletmanager.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kwallet/kwalletmanager.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kwallet/kwalletmanager.desktop	2009-10-09 23:30:23.000000000 +0100
@@ -58,6 +58,7 @@
 GenericName[ga]=Uirlis Bhainisteoireachta Sparáin
 GenericName[gl]=Ferramenta de xestión de carteiras
 GenericName[hne]=बटुआ प्रबंधन औजार
+GenericName[hr]=Alat za upravljanje novčanikom
 GenericName[hu]=Jelszókezelő
 GenericName[it]=Strumento per la gestione dei portafogli
 GenericName[ja]=ウォレット管理ツール
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/kwallet/kwalletmanager-kwalletd.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/kwallet/kwalletmanager-kwalletd.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/kwallet/kwalletmanager-kwalletd.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/kwallet/kwalletmanager-kwalletd.desktop	2009-10-09 23:30:23.000000000 +0100
@@ -21,6 +21,7 @@
 Name[gl]=Ferramenta de xestión de carteiras
 Name[he]=כלי לניהול הארנק של KDE
 Name[hne]=बटुआ प्रबंधन औजार
+Name[hr]=Alat za upravljanje novčanikom
 Name[hu]=Kezelőprogram a KDE digitális noteszeihez
 Name[is]=Tól til að stýra eiginleikum veskisins
 Name[it]=Strumento per la gestione dei portafogli
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/okteta/parts/kbytesedit/kbytearrayedit.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/okteta/parts/kbytesedit/kbytearrayedit.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/okteta/parts/kbytesedit/kbytearrayedit.desktop	2009-10-06 23:27:44.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/okteta/parts/kbytesedit/kbytearrayedit.desktop	2009-10-09 23:30:23.000000000 +0100
@@ -21,6 +21,7 @@
 Name[gl]=Widget BytesEdit
 Name[he]=פריט עורך הביטויים הסדירים
 Name[hne]=बाइट्स-एडिट विजेट
+Name[hr]=Widget BytesEdit
 Name[hu]=BytesEdit grafikus elem
 Name[is]=Græja til að sýsla með bætaskrár
 Name[it]=Elemento grafico editor di byte
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/superkaramba/plasma/plasma-package-superkaramba.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/superkaramba/plasma/plasma-package-superkaramba.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/superkaramba/plasma/plasma-package-superkaramba.desktop	2009-10-06 23:27:44.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/superkaramba/plasma/plasma-package-superkaramba.desktop	2009-10-09 23:30:24.000000000 +0100
@@ -16,6 +16,7 @@
 Name[ga]=Comhaid Téama SuperKaramba
 Name[gl]=Ficheiros de tema de SuperKaramba
 Name[hne]=सुपरकराम्बा प्रसंग फाइल
+Name[hr]=Datoteke teme SuperKaramba
 Name[hu]=SuperKaramba-témafájlok
 Name[it]=File di tema SuperKaramba
 Name[ja]=SuperKaramba テーマファイル
@@ -60,6 +61,7 @@
 Comment[ga]=Téamaí Deisce Karamba
 Comment[gl]=Temas de escritorio de Karamba
 Comment[hne]=कराम्बा डेस्कटाप प्रसंग
+Comment[hr]=Teme radne površine Karamba
 Comment[hu]=Karamba-témák
 Comment[it]=Temi desktop Karamba
 Comment[ja]=Karamba デスクトップテーマ
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop	2009-10-06 23:27:44.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop	2009-10-09 23:30:24.000000000 +0100
@@ -20,6 +20,7 @@
 Name[gl]=SuperKaramba
 Name[he]=SuperKaramba
 Name[hne]=सुपरकराम्बा
+Name[hr]=SuperKaramba
 Name[hu]=SuperKaramba
 Name[is]=SúperKaramba
 Name[it]=SuperKaramba
@@ -70,6 +71,7 @@
 Comment[ga]=Téama Deisce Karamba
 Comment[gl]=Tema de escritorio de Karamba
 Comment[hne]=कराम्बा डेस्कटाप प्रसंग
+Comment[hr]=Tema radne površine Karamba
 Comment[hu]=Karamba-téma
 Comment[it]=Tema desktop Karamba
 Comment[ja]=Karamba のデスクトップテーマ
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/superkaramba/plasma/plasma-skapplet-default.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/superkaramba/plasma/plasma-skapplet-default.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/superkaramba/plasma/plasma-skapplet-default.desktop	2009-10-06 23:27:44.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/superkaramba/plasma/plasma-skapplet-default.desktop	2009-10-09 23:30:24.000000000 +0100
@@ -20,6 +20,7 @@
 Name[gl]=SuperKaramba
 Name[he]=SuperKaramba
 Name[hne]=सुपरकराम्बा
+Name[hr]=SuperKaramba
 Name[hu]=SuperKaramba
 Name[is]=SúperKaramba
 Name[it]=SuperKaramba
@@ -72,6 +73,7 @@
 Comment[gl]=Aplicaciónciña de SuperKaramba para Plasma
 Comment[he]=יישומון Plasma  עבור Superkaramba
 Comment[hne]=सुपरकराम्बा प्लाज्मा ऐप्लेट
+Comment[hr]=Plasma-applet SuperKaramba
 Comment[hu]=SuperKaramba Plasma-kisalkalmazás
 Comment[it]=File di tema SuperKaramba
 Comment[ja]=SuperKaramba Plasma アプレット
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/superkaramba/src/superkaramba.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/superkaramba/src/superkaramba.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/superkaramba/src/superkaramba.desktop	2009-10-06 23:27:44.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/superkaramba/src/superkaramba.desktop	2009-10-09 23:30:24.000000000 +0100
@@ -20,6 +20,7 @@
 Name[gl]=SuperKaramba
 Name[he]=SuperKaramba
 Name[hne]=सुपरकराम्बा
+Name[hr]=SuperKaramba
 Name[hu]=SuperKaramba
 Name[is]=SúperKaramba
 Name[it]=SuperKaramba
diff -Nru /tmp/z3Nyi06728/kde-nightly-kdeutils-20091006+svn1032120/sweeper/sweeper.desktop /tmp/PBX5ArY0qJ/kde-nightly-kdeutils-20091009+svn1033340/sweeper/sweeper.desktop
--- kde-nightly-kdeutils-20091006+svn1032120/sweeper/sweeper.desktop	2009-10-06 23:27:43.000000000 +0100
+++ kde-nightly-kdeutils-20091009+svn1033340/sweeper/sweeper.desktop	2009-10-09 23:30:23.000000000 +0100
@@ -74,6 +74,7 @@
 GenericName[gl]=Limpador do sistema
 GenericName[he]=מנקה מערכת
 GenericName[hne]=सिसटम क्लीनर
+GenericName[hr]=Sustavski čistač
 GenericName[hu]=Rendszertisztító
 GenericName[it]=Pulizia del sistema e riservatezza dei dati
 GenericName[ja]=システムクリーナー