Streamline device manager naming scheme.

Signed-off-by: Chris <[email protected]>
(cherry picked from commit a8528d0066c6d71958b0c4c88819370c7ee4d6d0)

3 files changed, 31 insertions, 16 deletions

diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index a82daf1be..fbdc822c3 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -68,9 +68,9 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
 	systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" ));
 
 	TDEAboutData *about =
-	new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Hardware Device Manager"),
+	new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Device Manager\n\nCan be used to get all kind of informations about your devices on your system, shows which drivers are used by them and allows to change device settings."),
 		0, 0, TDEAboutData::License_GPL,
-		I18N_NOOP("(c) 2012 Timothy Pearson"));
+		I18N_NOOP("(c) 2012 Timothy Pearson\n(c) 2019 The Trinity Desktop Project"));
 	
 	about->addAuthor("Timothy Pearson", 0, "[email protected]");
 	setAboutData( about );
@@ -80,7 +80,7 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
 
 	base->deviceFilter->setListView(base->deviceTree);
 
-	setRootOnlyMsg(i18n("<b>Hardware settings are system wide, and therefore require administrator access</b><br>To alter the system's hardware settings, click on the \"Administrator Mode\" button below."));
+	setRootOnlyMsg(i18n("<b>Device settings are system wide, and therefore require administrator access</b><br>To alter the system's device settings, click on the \"Administrator Mode\" button below."));
 	setUseRootOnlyMsg(true);
 
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -209,7 +209,7 @@ void TDEHWManager::deviceChanged(TDEGenericDevice* device) {
 
 TQString TDEHWManager::quickHelp() const
 {
-  return i18n("<h1>TDE Hardware Device Manager</h1> This module allows you to configure hardware devices on your system");
+  return i18n("<h1>TDE Device Manager</h1> This module allows you to get all kind of informations about the devices on your system, the drivers which are used by them and to configure them as well.");
 }
 
 #include "hwmanager.moc"
diff --git a/kcontrol/hwmanager/hwmanager.desktop b/kcontrol/hwmanager/hwmanager.desktop
index d0ef60728..a0a374bbe 100644
--- a/kcontrol/hwmanager/hwmanager.desktop
+++ b/kcontrol/hwmanager/hwmanager.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=tdecmshell hwmanager
-Icon=hwinfo
+Icon=kcmpci
 Type=Application
 X-DocPath=kcontrol/hwmanager/index.html
 
@@ -8,14 +8,29 @@ X-TDE-Library=hwmanager
 X-TDE-ParentApp=kcontrol
 X-TDE-SubstituteUID=true
 
-Categories=Qt;TDE;X-TDE-settings-hardware;
+Name=Device Manager
+Name[cs]=Správce zařízení
+Name[de]=Geräteverwaltung
+Name[es]=Administrador de dispositivos
+Name[fr]=Gestionnaire de périphériques
+Name[it]=
+Name[ru]=Менеджер устройств
+
 Comment=Configure hardware devices
-Comment[en_US]=Configure hardware devices
-GenericName=
-GenericName[en_US]=
-Keywords=hardware;
-MimeType=
-Name=Hardware Device Manager
-Name[en_US]=Hardware Device Manager
+Comment[cs]=Nastavení hardwarových zařízení
+Comment[de]=Hardware-Geräte einrichten
+Comment[es]=Configuración de dispositivos
+Comment[fr]=Configurer des périphériques matériels
+Comment[it]=
+Comment[ru]=Конфигурация устройств
 
-NoDisplay=false
+Keywords=hardware;devices;manager;
+Keywords[cs]=hardware;zařízení;správce;
+Keywords[de]=Hardware;Geräte;Verwaltung;
+Keywords[es]=hardware;dispositivos;
+Keywords[fr]=Matériel;équipement;gestion
+Keywords[it]=
+Keywords[ru]=оборудование;усройства;
+
+Categories=Qt;TDE;X-TDE-settings-hardware;
+NoDisplay=false
\ No newline at end of file
diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui
index 9a6ecef63..6c785921d 100644
--- a/kcontrol/hwmanager/hwmanagerbase.ui
+++ b/kcontrol/hwmanager/hwmanagerbase.ui
@@ -20,7 +20,7 @@
                     <cstring>tab</cstring>
                 </property>
                 <attribute name="title">
-                    <string>Hardware Devices</string>
+                    <string>Devices</string>
                 </attribute>
                 <grid>
                     <property name="name">
@@ -83,4 +83,4 @@
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-</UI>
+</UI>
\ No newline at end of file