diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/knetworkmanager-0.8/po/ru.po b/knetworkmanager-0.8/po/ru.po index 93fe7e5..7abd490 100644 --- a/knetworkmanager-0.8/po/ru.po +++ b/knetworkmanager-0.8/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2008-06-04 13:52+0200\n" "PO-Revision-Date: 2008-05-24 16:50+0400\n" "Last-Translator: Aleksey Osipov \n" -"Language-Team: Russian \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/knetworkmanager-0.8/src/Makefile.am b/knetworkmanager-0.8/src/Makefile.am index c90e72a..16aca7a 100644 --- a/knetworkmanager-0.8/src/Makefile.am +++ b/knetworkmanager-0.8/src/Makefile.am @@ -203,9 +203,9 @@ knetworkmanager_la_LDFLAGS = -module \ knetworkmanager_la_LIBADD = dbus/libknm_dbus.la \ $(PACKAGE_LIBS) \ $(LIB_TDEUI) \ - $(LIB_KUTILS) \ + $(LIB_TDEUTILS) \ $(LIB_TDEWALLETCLIENT) \ - $(LIB_TDEUI) + $(LIB_TDEUI) # this is where the desktop file will go xdg_apps_DATA = knetworkmanager.desktop diff --git a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp index 57ee8c1..4b0fda3 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp @@ -126,7 +126,7 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID) int error = 0; KPluginInfo* info = infoForPluginID(pluginID); Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery( TQString::fromLatin1( "KNetworkManager/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error ); + TQString::fromLatin1( "[X-TDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error ); // plugin loaded? if (plugin)