From 756213b4f9699dc022b776810eade7dbd8082be3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 8 Sep 2012 15:41:39 -0500 Subject: [PATCH] Additional rebranding --- tdenetworkmanager/src/eventsrc | 18 +++++++++--------- tdenetworkmanager/src/main.cpp | 14 +++++++------- .../src/tdenetman-cellular_device_tray.cpp | 2 +- .../src/tdenetman-cellular_device_tray.h | 2 +- .../src/tdenetman-connection_editor.cpp | 2 +- .../src/tdenetman-device_tray.cpp | 4 ++-- .../src/tdenetman-nm_vpn_proxy.cpp | 2 +- tdenetworkmanager/src/tdenetman-tray.cpp | 12 ++++++------ tdenetworkmanager/src/tdenetman-vpn_plugin.cpp | 2 +- tdenetworkmanager/src/tdenetman-vpn_plugin.h | 2 +- .../src/tdenetman-wired_device_tray.cpp | 2 +- .../src/tdenetman-wired_device_tray.h | 2 +- .../src/tdenetman-wireless_device_tray.cpp | 6 +++--- .../src/tdenetman-wireless_device_tray.h | 2 +- .../src/tdenetman-wireless_manager.cpp | 2 +- .../src/tdenetman-wireless_manager.h | 2 +- .../src/tdenetman-wireless_network.cpp | 2 +- tdenetworkmanager/src/tdenetman.cpp | 2 +- tdenetworkmanager/src/tdenetman.h | 2 +- tdenetworkmanager/src/vpn_tray_component.cpp | 2 +- tdenetworkmanager/src/vpn_tray_component.h | 2 +- 21 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tdenetworkmanager/src/eventsrc b/tdenetworkmanager/src/eventsrc index df039f5..16438de 100644 --- a/tdenetworkmanager/src/eventsrc +++ b/tdenetworkmanager/src/eventsrc @@ -5,11 +5,11 @@ Comment[bn]=কে-নেটওয়ার্ক-ম্যানেজার Comment[da]=Netværkshåndtering Comment[sv]=Nätverkshantering -[knm-nm-vpn-banner] +[tdenm-nm-vpn-banner] Comment=VPN Banner Notification Received default_presentation=0 -[knm-nm-sleeping] +[tdenm-nm-sleeping] Name=TDENetworkManager Offline Name[bg]=TDENetworkManager - изключен от Интернет Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার অফলাইন @@ -47,7 +47,7 @@ Comment[sv]=Bytte till nerkopplat läge Comment[tr]=Çevrimdışı kipe geçildi default_presentation=0 -[knm-nm-connected] +[tdenm-nm-connected] Name=TDENetworkManager Connected Name[bg]=TDENetworkManager - свързан Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার সংযুক্ত @@ -87,7 +87,7 @@ Comment[sv]=Networkmanager är nu ansluten Comment[tr]=NetworkManager şimdi bağlı default_presentation=0 -[knm-nm-connecting] +[tdenm-nm-connecting] Name=TDENetworkManager Connecting Name[bg]=TDENetworkManager се свързва Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার সংযোগ স্থাপন করছে @@ -124,7 +124,7 @@ Comment[sv]=Networkmanager kopplar upp Comment[tr]=NetworkManager bağlanıyor default_presentation=0 -[knm-nm-disconnected] +[tdenm-nm-disconnected] Name=TDENetworkManager Disconnected Name[bg]=TDENetworkManager - изключен от Интернет Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার সংযোগ বিহীন @@ -162,7 +162,7 @@ Comment[sv]=Networkmanager är nu nerkopplad Comment[tr]=NetworkManager artık bağlı değil default_presentation=0 -[knm-nm-device-added] +[tdenm-nm-device-added] Name=TDENetworkManager Device Added Name[bg]=TDENetworkManager - добавено е устройство Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার ডিভাইস যোগ করা হয়েছে @@ -200,7 +200,7 @@ Comment[sv]=Ny nätverksenhet hittades Comment[tr]=Yeni ağ aygıtı bulundu default_presentation=0 -[knm-nm-device-removed] +[tdenm-nm-device-removed] Name=TDENetworkManager Device Removed Name[bg]=TDENetworkManager - устройството е премахнато Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার ডিভাইস অপসারিত করা হয়েছে @@ -238,7 +238,7 @@ Comment[sv]=Nätverksenhet borttagen Comment[tr]=Ağ aygıtı kaldırıldı default_presentation=0 -[knm-nm-network-found] +[tdenm-nm-network-found] Name=TDENetworkManager New Wireless Network Found Name[bg]=TDENetworkManager - намерена е нова безжична мрежа Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার নতুন ওয়্যারলেস নেটওয়ার্ক খুঁজে পেয়েছে @@ -275,7 +275,7 @@ Comment[sv]=Nytt trådlöst nätverk hittades Comment[tr]=Yeni kablosuz ağ bulundu default_presentation=0 -[knm-nm-network-gone] +[tdenm-nm-network-gone] Name=TDENetworkManager Wireless Network Disappeared Name[bg]=TDENetworkManager - безжичната мрежа се изгуби Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার ওয়্যারলেস নেটওয়ার্ক অন্তর্ধান করেছে diff --git a/tdenetworkmanager/src/main.cpp b/tdenetworkmanager/src/main.cpp index 08cd81e..f8c86cb 100644 --- a/tdenetworkmanager/src/main.cpp +++ b/tdenetworkmanager/src/main.cpp @@ -31,21 +31,21 @@ // TQt includes #include -// KNM includes +// TDENM includes #include "tdenetman.h" -static const char* knm_version = I18N_NOOP(KNETWORKMANAGER_VERSION_STRING); -static const char* knm_descr = I18N_NOOP("A NetworkManager front-end for TDE"); -static const char* knm_copy = I18N_NOOP("Copyright (C) 2012 Trinity Destop Project"); -static const char* knm_webpage = I18N_NOOP("http://www.trinitydesktop.org"); +static const char* tdenm_version = I18N_NOOP(KNETWORKMANAGER_VERSION_STRING); +static const char* tdenm_descr = I18N_NOOP("A NetworkManager front-end for TDE"); +static const char* tdenm_copy = I18N_NOOP("Copyright (C) 2012 Trinity Destop Project"); +static const char* tdenm_webpage = I18N_NOOP("http://www.trinitydesktop.org"); extern "C" KDE_EXPORT int kdemain (int argc, char* argv[]) { KAboutData aboutData ("tdenetworkmanager", I18N_NOOP("TDENetworkManager"), - knm_version, knm_descr, KAboutData::License_GPL, - knm_copy, 0, knm_webpage ); + tdenm_version, tdenm_descr, KAboutData::License_GPL, + tdenm_copy, 0, tdenm_webpage ); aboutData.addAuthor ("Timothy Pearson", I18N_NOOP("TDE Rewrite"), "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor ("Helmut Schaa", I18N_NOOP("Maintainer"), "hschaa@suse.de"); diff --git a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp index c1a85f9..d21e511 100644 --- a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp +++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp @@ -30,7 +30,7 @@ #include #include -// KNM includes +// TDENM includes #include "tdenetman-cellular_device_tray.h" #include "tdenetman-menuitem.h" #include "tdenetman-menu_subhead.h" diff --git a/tdenetworkmanager/src/tdenetman-cellular_device_tray.h b/tdenetworkmanager/src/tdenetman-cellular_device_tray.h index ed7719b..28de864 100644 --- a/tdenetworkmanager/src/tdenetman-cellular_device_tray.h +++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.h @@ -27,7 +27,7 @@ #ifndef KNETWORKMANAGER_CELLULAR_DEVICE_TRAY_H #define KNETWORKMANAGER_CELLULAR_DEVICE_TRAY_H -// KNM includes +// TDENM includes #include "tdenetman.h" #include "devicetraycomponent.h" diff --git a/tdenetworkmanager/src/tdenetman-connection_editor.cpp b/tdenetworkmanager/src/tdenetman-connection_editor.cpp index 961946f..22886dd 100644 --- a/tdenetworkmanager/src/tdenetman-connection_editor.cpp +++ b/tdenetworkmanager/src/tdenetman-connection_editor.cpp @@ -41,7 +41,7 @@ #include #include -// knm headers +// tdenm headers #include "tdenetman-connection_editor.h" #include "tdenetman-connection_settings_dialog.h" diff --git a/tdenetworkmanager/src/tdenetman-device_tray.cpp b/tdenetworkmanager/src/tdenetman-device_tray.cpp index a58b3fc..798b707 100644 --- a/tdenetworkmanager/src/tdenetman-device_tray.cpp +++ b/tdenetworkmanager/src/tdenetman-device_tray.cpp @@ -55,7 +55,7 @@ class WirelessDialog; #include #include -// KNM includes +// TDENM includes #include "tdenetman-device_tray.h" #include "tdenetman-menu_subhead.h" #include "tdenetman-connection_settings_dialog.h" @@ -360,7 +360,7 @@ DeviceTray::DeviceTray (TDENetworkDevice* dev) : KSystemTray () setMouseTracking (true); - // defer the initial call to slotUpdateDeviceState as it will crash knm when called directly from here + // defer the initial call to slotUpdateDeviceState as it will crash tdenm when called directly from here // virtual method calls are not allowed in constructor TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateDeviceState())); diff --git a/tdenetworkmanager/src/tdenetman-nm_vpn_proxy.cpp b/tdenetworkmanager/src/tdenetman-nm_vpn_proxy.cpp index 8ef0ecb..cfe48ab 100644 --- a/tdenetworkmanager/src/tdenetman-nm_vpn_proxy.cpp +++ b/tdenetworkmanager/src/tdenetman-nm_vpn_proxy.cpp @@ -38,7 +38,7 @@ #include #include -// KNM includes +// TDENM includes #include "tdenetman.h" #include "tdenetman-nm_vpn_proxy.h" #include "tdenetman-device.h" diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp index 5e0a9a1..793e643 100644 --- a/tdenetworkmanager/src/tdenetman-tray.cpp +++ b/tdenetworkmanager/src/tdenetman-tray.cpp @@ -669,13 +669,13 @@ void Tray::updateActiveConnection(TDENetworkConnectionStatus::TDENetworkConnecti void Tray::slotDeviceAddedNotify(TDENetworkDevice* dev) { kdDebug() << "Tray::slotDeviceAddedNotify" << endl; - KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").arg(dev->deviceNode()) ); + KNotifyClient::event( winId(), "tdenm-nm-device-added", i18n("New network device %1 found").arg(dev->deviceNode()) ); } void Tray::slotDeviceRemovedNotify(TDENetworkDevice* dev) { kdDebug() << "Tray::slotDeviceRemovedNotify" << endl; - KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").arg(dev->deviceNode()) ); + KNotifyClient::event( winId(), "tdenm-nm-device-removed", i18n("Network device %1 removed").arg(dev->deviceNode()) ); } void Tray::slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags newState, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags prevState) @@ -684,16 +684,16 @@ void Tray::slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobal // change tray icon according to NM's state if (nm_state & TDENetworkGlobalManagerFlags::EstablishingLink) { - KNotifyClient::event( winId(), "knm-nm-connecting", i18n("NetworkManager is connecting") ); + KNotifyClient::event( winId(), "tdenm-nm-connecting", i18n("NetworkManager is connecting") ); } else if (nm_state & TDENetworkGlobalManagerFlags::Disconnected) { - KNotifyClient::event( winId(), "knm-nm-disconnected", i18n("NetworkManager is now disconnected") ); + KNotifyClient::event( winId(), "tdenm-nm-disconnected", i18n("NetworkManager is now disconnected") ); } else if (nm_state & TDENetworkGlobalManagerFlags::Connected) { - KNotifyClient::event( winId(), "knm-nm-connected", i18n("NetworkManager is now connected") ); + KNotifyClient::event( winId(), "tdenm-nm-connected", i18n("NetworkManager is now connected") ); } else if (nm_state & TDENetworkGlobalManagerFlags::Sleeping) { - KNotifyClient::event( winId(), "knm-nm-sleeping", i18n("TDENetworkManager Offline") ); + KNotifyClient::event( winId(), "tdenm-nm-sleeping", i18n("TDENetworkManager Offline") ); } else if (nm_state & TDENetworkGlobalManagerFlags::Unknown) { // diff --git a/tdenetworkmanager/src/tdenetman-vpn_plugin.cpp b/tdenetworkmanager/src/tdenetman-vpn_plugin.cpp index dc7351f..94f20b4 100644 --- a/tdenetworkmanager/src/tdenetman-vpn_plugin.cpp +++ b/tdenetworkmanager/src/tdenetman-vpn_plugin.cpp @@ -38,7 +38,7 @@ #include #include -// KNM includes +// TDENM includes #include "tdenetman.h" #include "tdenetman-tray.h" #include "tdenetman-vpn_plugin.h" diff --git a/tdenetworkmanager/src/tdenetman-vpn_plugin.h b/tdenetworkmanager/src/tdenetman-vpn_plugin.h index 56a03d6..674a402 100644 --- a/tdenetworkmanager/src/tdenetman-vpn_plugin.h +++ b/tdenetworkmanager/src/tdenetman-vpn_plugin.h @@ -29,7 +29,7 @@ // std includes #include -// KNM includes +// TDENM includes #include "tdenetman.h" class TDENetworkManager; diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp index 59ceb33..e816f03 100644 --- a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp +++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp @@ -44,7 +44,7 @@ #include -// KNM includes +// TDENM includes #include "tdenetman-wired_device_tray.h" #include "tdenetman-menuitem.h" #include "tdenetman-menu_subhead.h" diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.h b/tdenetworkmanager/src/tdenetman-wired_device_tray.h index c358790..6200f91 100644 --- a/tdenetworkmanager/src/tdenetman-wired_device_tray.h +++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.h @@ -27,7 +27,7 @@ #ifndef KNETWORKMANAGER_WIRED_DEVICE_TRAY_H #define KNETWORKMANAGER_WIRED_DEVICE_TRAY_H -// KNM includes +// TDENM includes #include "devicetraycomponent.h" #include "tdenetman.h" diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp index d66eeeb..cd5c786 100644 --- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp +++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp @@ -42,7 +42,7 @@ #include #include -// KNM includes +// TDENM includes #include "tdenetman-wireless_device_tray.h" #include "tdenetman-wireless_menuitem.h" #include "tdenetman-wireless_network.h" @@ -397,12 +397,12 @@ void WirelessDeviceTray::apPropertyChanged(TDEMACAddress BSSID, TDENetworkAPEven void WirelessDeviceTray::slotAccessPointAdded(TDENetworkWiFiAPInfo* ap) { - KNotifyClient::event( tray()->winId(), "knm-nm-network-found", i18n("TDENetworkManager New Wireless Network Found") ); + KNotifyClient::event( tray()->winId(), "tdenm-nm-network-found", i18n("TDENetworkManager New Wireless Network Found") ); } void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress) { - KNotifyClient::event( tray()->winId(), "knm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") ); + KNotifyClient::event( tray()->winId(), "tdenm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") ); } void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString) diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h index c7eebb8..aad6325 100644 --- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h +++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h @@ -27,7 +27,7 @@ #ifndef KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H #define KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H -// KNM includes +// TDENM includes #include "tdenetman.h" #include "devicetraycomponent.h" #include "tdenetman-wireless_network.h" diff --git a/tdenetworkmanager/src/tdenetman-wireless_manager.cpp b/tdenetworkmanager/src/tdenetman-wireless_manager.cpp index 7692a00..6a9b28c 100644 --- a/tdenetworkmanager/src/tdenetman-wireless_manager.cpp +++ b/tdenetworkmanager/src/tdenetman-wireless_manager.cpp @@ -25,7 +25,7 @@ // other includes #include -// KNM includes +// TDENM includes #include "tdenetman-wireless_manager.h" TQValueList WirelessManager::getWirelessNetworks(TDENetworkDevice* dev, TQ_UINT32 match) diff --git a/tdenetworkmanager/src/tdenetman-wireless_manager.h b/tdenetworkmanager/src/tdenetman-wireless_manager.h index 6800930..3eacd6c 100644 --- a/tdenetworkmanager/src/tdenetman-wireless_manager.h +++ b/tdenetworkmanager/src/tdenetman-wireless_manager.h @@ -29,7 +29,7 @@ #include #include -// KNM includes +// TDENM includes #include "tdenetman.h" #include "tdenetman-device_tray.h" #include "tdenetman-wireless_network.h" diff --git a/tdenetworkmanager/src/tdenetman-wireless_network.cpp b/tdenetworkmanager/src/tdenetman-wireless_network.cpp index c0e20ce..d3105df 100644 --- a/tdenetworkmanager/src/tdenetman-wireless_network.cpp +++ b/tdenetworkmanager/src/tdenetman-wireless_network.cpp @@ -22,7 +22,7 @@ * **************************************************************************/ -// KNM includes +// TDENM includes #include "tdenetman.h" #include "tdenetman-wireless_network.h" diff --git a/tdenetworkmanager/src/tdenetman.cpp b/tdenetworkmanager/src/tdenetman.cpp index 9ef8f9f..19238b3 100644 --- a/tdenetworkmanager/src/tdenetman.cpp +++ b/tdenetworkmanager/src/tdenetman.cpp @@ -28,7 +28,7 @@ #include #include -// KNM includes +// TDENM includes #include "tdenetman.h" #include "tdenetman-tray.h" diff --git a/tdenetworkmanager/src/tdenetman.h b/tdenetworkmanager/src/tdenetman.h index 8fd1a05..6365b89 100644 --- a/tdenetworkmanager/src/tdenetman.h +++ b/tdenetworkmanager/src/tdenetman.h @@ -28,7 +28,7 @@ // TDE includes #include -// KNM includes +// TDENM includes #include "config.h" class TDENetworkManagerPrivate; diff --git a/tdenetworkmanager/src/vpn_tray_component.cpp b/tdenetworkmanager/src/vpn_tray_component.cpp index 04ceffc..49474b2 100644 --- a/tdenetworkmanager/src/vpn_tray_component.cpp +++ b/tdenetworkmanager/src/vpn_tray_component.cpp @@ -31,7 +31,7 @@ #include -// KNM includes +// TDENM includes #include "vpn_tray_component.h" #include "tdenetman-menuitem.h" #include "tdenetman-menu_subhead.h" diff --git a/tdenetworkmanager/src/vpn_tray_component.h b/tdenetworkmanager/src/vpn_tray_component.h index eb0377d..11107c4 100644 --- a/tdenetworkmanager/src/vpn_tray_component.h +++ b/tdenetworkmanager/src/vpn_tray_component.h @@ -25,7 +25,7 @@ #ifndef VPN_TRAY_COMPONENT_H #define VPN_TRAY_COMPONENT_H -// KNM includes +// TDENM includes #include "traycomponent.h" #include "tdenetman.h"