improve several text strings

* tdecore/tdehw: replace several obscure strings with something closer
  to reality
* tderandr: remove i18n from a string whic shouldn't be translated
* tdeutils/kdeglobals.kcfg: various config comments improvements

Signed-off-by: Alexander Golubev <[email protected]>

3 files changed, 14 insertions, 6 deletions

diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp
index c593d2ab6..14d23196e 100644
--- a/tdecore/tdehw/tdecryptographiccarddevice.cpp
+++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp
@@ -709,7 +709,7 @@ int TDECryptographicCardDevice::decryptDataEncryptedWithCertPublicKey(TQValueLis
 	int ret = -1;
 
 	if (!m_watcherObject) {
-		if (errstr) *errstr = i18n("Card watcher object not available");
+		if (errstr) *errstr = i18n("Internal error: card watcher object not available");
 		return -1;
 	}
 
diff --git a/tdecore/tdehw/tdegenericdevice.cpp b/tdecore/tdehw/tdegenericdevice.cpp
index e9a645cf1..1a3a24e7b 100644
--- a/tdecore/tdehw/tdegenericdevice.cpp
+++ b/tdecore/tdehw/tdegenericdevice.cpp
@@ -227,13 +227,18 @@ TQString TDEGenericDevice::busID() {
 TQString TDEGenericDevice::friendlyName() {
 	if (m_friendlyName.isNull()) {
 		if (type() == TDEGenericDeviceType::RootSystem) {
-			m_friendlyName = "Linux System";
+#ifdef __linux__
+			m_friendlyName = i18n("Linux System");
+#else  // __linux__
+            // Just in case this somehow can be supported on a non-linux system
+			m_friendlyName = i18n("Local System");
+#endif // __linux__
 		}
 		else if (type() == TDEGenericDeviceType::Root) {
 			TQString friendlyDriverName = systemPath();
 			friendlyDriverName.truncate(friendlyDriverName.length()-1);
 			friendlyDriverName.remove(0, friendlyDriverName.findRev("/")+1);
-			m_friendlyName = friendlyDriverName;
+			m_friendlyName = i18n("Device directory (%1)").arg(friendlyDriverName);
 		}
 		else if (m_modAlias.lower().startsWith("pci")) {
 			m_friendlyName = TDEGlobal::hardwareDevices()->findPCIDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID);
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index dbeffad6c..045d9340c 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -2389,6 +2389,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD
 				}
 				else if (usbInterfaceClass == 14) {
 					// Fingerprint Reader
+					// NOTE: usb class 14 is actually for "Video" devices but uvc devices (webcams) should have been handled above
 					if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::BiometricSecurity);
 				}
 				else if (usbInterfaceClass == 254) {
@@ -4200,10 +4201,12 @@ TQString TDEHardwareDevices::getFriendlyDeviceTypeStringFromType(TDEGenericDevic
 
 	// Keep this in sync with the TDEGenericDeviceType definition in the header
 	if (query == TDEGenericDeviceType::Root) {
-		ret = i18n("Root");
+		//i18n: this represents a pseudo device type of a device class directory like /sys/devices/* on linux
+		ret = i18n("Device directory");
 	}
 	else if (query == TDEGenericDeviceType::RootSystem) {
-		ret = i18n("System Root");
+		//i18n: this represents the whole local system and /sys/devices/ directory
+		ret = i18n("Root System");
 	}
 	else if (query == TDEGenericDeviceType::CPU) {
 		ret = i18n("CPU");
@@ -4278,7 +4281,7 @@ TQString TDEHardwareDevices::getFriendlyDeviceTypeStringFromType(TDEGenericDevic
 		ret = i18n("Camera");
 	}
 	else if (query == TDEGenericDeviceType::TextIO) {
-		ret = i18n("Text I/O");
+		ret = i18n("TTY Device");
 	}
 	else if (query == TDEGenericDeviceType::Serial) {
 		ret = i18n("Serial Communications Controller");