summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris <xchrisx@uber.space>2019-10-10 00:16:42 +0200
committerTDE Gitea <gitea@mirror.git.trinitydesktop.org>2019-10-12 16:18:09 +0000
commit45f848f6d2f4468eb14a2884591ca08990607c97 (patch)
tree2561d56d4911823acc6944f97a6c9a8b8c654478
parent752183c265003c18abd3d6f7babe9ec2fa214da3 (diff)
downloadtdebase-45f848f6d2f4468eb14a2884591ca08990607c97.tar.gz
tdebase-45f848f6d2f4468eb14a2884591ca08990607c97.zip
Streamline device monitor naming scheme.
Signed-off-by: Chris <xchrisx@uber.space>
-rw-r--r--kcontrol/hwmanager/hwdevicetray-autostart.desktop20
-rw-r--r--kcontrol/hwmanager/hwdevicetray.cpp12
-rw-r--r--kcontrol/hwmanager/hwdevicetray.desktop20
-rw-r--r--kcontrol/hwmanager/hwdevicetray_bindings.cpp2
-rw-r--r--kcontrol/hwmanager/hwdevicetray_configdialog.cpp2
-rw-r--r--kcontrol/hwmanager/hwdevicetray_main.cpp3
6 files changed, 46 insertions, 13 deletions
diff --git a/kcontrol/hwmanager/hwdevicetray-autostart.desktop b/kcontrol/hwmanager/hwdevicetray-autostart.desktop
index 57bd9b893..07f62f05b 100644
--- a/kcontrol/hwmanager/hwdevicetray-autostart.desktop
+++ b/kcontrol/hwmanager/hwdevicetray-autostart.desktop
@@ -1,9 +1,25 @@
[Desktop Entry]
Name=tdehwdevicetray
-GenericName=Hardware Device Monitor
+
+GenericName=Device Monitor
+GenericName[cs]=Sledování zařízení
+GenericName[de]=Geräteüberwachung
+GenericName[es]=Monitor de dispositivos
+GenericName[fr]=Moniteur de périphériques
+GenericName[it]=Monitor dei dispositivi hardware
+GenericName[ru]=Диспетчер устройств
+
Comment=Monitor hardware devices from the system tray
+Comment[cs]=Sledování hardwarových zařízení ze systémového panelu
+Comment[de]=Überwacht Hardware-Geräte aus dem Systembereich der Kontrollleiste heraus
+Comment[es]=Observe dispositivos desde área de notificación
+Comment[fr]=Surveille les périphériques matériels depuis la barre d’état système
+Comment[it]=Monitora i dispositivi hardware dall’area di notifica di sistema
+Comment[ru]=Отслеживание устройств в области уведомлений
+
Exec=tdehwdevicetray
-Icon=kcmdevices
+Icon=hwinfo
+
X-TDE-autostart-after=panel
X-TDE-StartupNotify=false
X-TDE-UniqueApplet=true
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index bc9b6fbf4..18ef3d5e9 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -59,10 +59,10 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name)
TDEPopupMenu *help = m_help->menu();
help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
- setPixmap(KSystemTray::loadIcon("kcmdevices"));
+ setPixmap(KSystemTray::loadIcon("hwinfo"));
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
- TQToolTip::add(this, i18n("Hardware device monitor"));
+ TQToolTip::add(this, i18n("Device monitor"));
m_parent = parent;
globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
@@ -98,7 +98,7 @@ HwDeviceSystemTray::~HwDeviceSystemTray() {
void HwDeviceSystemTray::_quit () {
r_config = new KSimpleConfig("tdehwdevicetrayrc");
- TQString tmp1 = i18n ("Start hardware device tray automatically when you log in?");
+ TQString tmp1 = i18n ("Start device monitor automatically when you log in?");
int tmp2 = KMessageBox::questionYesNo (0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
r_config->setGroup("General");
r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes);
@@ -112,7 +112,7 @@ void HwDeviceSystemTray::resizeTrayIcon () {
TQPixmap origpixmap;
TQPixmap scaledpixmap;
TQImage newIcon;
- origpixmap = KSystemTray::loadSizedIcon("kcmdevices", width());
+ origpixmap = KSystemTray::loadSizedIcon("hwinfo", width());
newIcon = origpixmap;
newIcon = newIcon.smoothScale(width(), height());
scaledpixmap = newIcon;
@@ -195,7 +195,7 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) {
menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration"));
- TDEAction *actHardwareConfig = new TDEAction(i18n("Configure Hardware..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection());
+ TDEAction *actHardwareConfig = new TDEAction(i18n("Configure Devices..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection());
actHardwareConfig->plug(menu);
TDEAction *actShortcutKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditShortcutKeys()), actionCollection());
@@ -318,7 +318,7 @@ void HwDeviceSystemTray::slotHardwareConfig() {
KCMultiDialog *kcm = new KCMultiDialog(KDialogBase::Plain, i18n("Configure"), this);
kcm->addModule("hwmanager");
- kcm->setPlainCaption(i18n("Configure Hardware"));
+ kcm->setPlainCaption(i18n("Configure Devices"));
kcm->exec();
}
diff --git a/kcontrol/hwmanager/hwdevicetray.desktop b/kcontrol/hwmanager/hwdevicetray.desktop
index 20a0297ce..546549918 100644
--- a/kcontrol/hwmanager/hwdevicetray.desktop
+++ b/kcontrol/hwmanager/hwdevicetray.desktop
@@ -1,9 +1,25 @@
[Desktop Entry]
Name=tdehwdevicetray
-GenericName=Hardware Device Monitor
+
+GenericName=Device Monitor
+GenericName[cs]=Sledování zařízení
+GenericName[de]=Geräteüberwachung
+GenericName[es]=Monitor de dispositivos
+GenericName[fr]=Moniteur de périphériques
+GenericName[it]=Monitor dei dispositivi hardware
+GenericName[ru]=Диспетчер устройств
+
Comment=Monitor hardware devices from the system tray
+Comment[cs]=Sledování hardwarových zařízení ze systémového panelu
+Comment[de]=Überwacht Hardware-Geräte aus dem Systembereich der Kontrollleiste heraus
+Comment[es]=Observe dispositivos desde área de notificación
+Comment[fr]=Surveille les périphériques matériels depuis la barre d’état système
+Comment[it]=Monitora i dispositivi hardware dall’area di notifica di sistema
+Comment[ru]=Отслеживание устройств в области уведомлений
+
Exec=tdehwdevicetray
-Icon=kcmdevices
+Icon=hwinfo
+
Type=Application
OnlyShowIn=TDE;
Categories=Qt;TDE;System;
diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
index 216b1a709..08145cb9e 100644
--- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
@@ -26,7 +26,7 @@
#endif
#define WIN KKey::QtWIN
- keys->insert( "Program:hwdevicetray", i18n("Hardware Device Control") );
+ keys->insert( "Program:hwdevicetray", i18n("Device Control") );
// DEF( I18N_NOOP("Switch Displays"), TDEShortcut(TQString("XF86Display")), TDEShortcut(TQString("XF86Display")), slotCycleDisplays() );
diff --git a/kcontrol/hwmanager/hwdevicetray_configdialog.cpp b/kcontrol/hwmanager/hwdevicetray_configdialog.cpp
index 648cdd72f..c98944461 100644
--- a/kcontrol/hwmanager/hwdevicetray_configdialog.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_configdialog.cpp
@@ -38,7 +38,7 @@
ConfigDialog::ConfigDialog(TDEGlobalAccel *accel, bool isApplet)
: KDialogBase(Tabbed, i18n("Configure"), Ok | Cancel | Help, Ok, 0L, "config dialog") {
if (isApplet) {
- setHelp(TQString::null, "tderandrtray");
+ setHelp(TQString::null, "tdehwdevicetray");
}
TQFrame *w = 0L; // the parent for the widgets
diff --git a/kcontrol/hwmanager/hwdevicetray_main.cpp b/kcontrol/hwmanager/hwdevicetray_main.cpp
index 9aad857f9..dc0704d57 100644
--- a/kcontrol/hwmanager/hwdevicetray_main.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_main.cpp
@@ -36,7 +36,8 @@ static const TDECmdLineOptions options[] =
int main(int argc, char **argv)
{
- TDEAboutData aboutData("hwdevicetray", I18N_NOOP("Hardware Device Monitor"), hwdevicetrayVersion, I18N_NOOP("Hardware Device Monitor Tray Application"), TDEAboutData::License_GPL_V3, "(c) 2015 Timothy Pearson", 0L, "");
+ TDEAboutData aboutData("hwdevicetray", I18N_NOOP("Device Monitor"), hwdevicetrayVersion, I18N_NOOP("Device Monitor Tray Application\n\nAllows you not only to get informations about hardware changes on your system,\nbut also to open and eject storage devices if possible."), TDEAboutData::License_GPL_V3,
+ "(c) 2015 Timothy Pearson\n(c) 2019 The Trinity Desktop Project", 0L, "");
aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Initial developer and maintainer"), "kb9vqf@pearsoncomputing.net");
aboutData.setProductName("hwdevices/hwdevicetray");
TDEGlobal::locale()->setMainCatalogue("tdehwdevicetray");