[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] tier1/solid/src/solid: solid: Port translations to correct contextless Qt funct
From: George Goldberg <grundleborg () googlemail ! com>
Date: 2012-08-09 14:06:30
Message-ID: 20120809140630.6AC77A6094 () git ! kde ! org
[Download RAW message or body]
Git commit 2d9b923ab34714359b9d5e9806ac494e66e3bf28 by George Goldberg.
Committed on 09/08/2012 at 15:20.
Pushed by gberg into branch 'frameworks'.
solid: Port translations to correct contextless Qt functions and macros.
REVIEW: 105944
M +4 -2 tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
M +77 -76 tier1/solid/src/solid/backends/hal/haldevice.cpp
M +1 -1 tier1/solid/src/solid/backends/kupnp/internetgatewaydevice1.cpp
M +21 -23 tier1/solid/src/solid/backends/kupnp/kupnpdevice.cpp
M +1 -3 tier1/solid/src/solid/backends/kupnp/kupnprootdevice.cpp
M +1 -1 tier1/solid/src/solid/backends/kupnp/mediaserver1.cpp
M +1 -1 tier1/solid/src/solid/backends/kupnp/mediaserver2.cpp
M +1 -1 tier1/solid/src/solid/backends/kupnp/mediaserver3.cpp
M +6 -6 tier1/solid/src/solid/backends/udev/udevdevice.cpp
M +3 -2 tier1/solid/src/solid/backends/udev/udevmanager.cpp
M +78 -77 tier1/solid/src/solid/backends/udisks/udisksdevice.cpp
M +3 -2 tier1/solid/src/solid/backends/udisks/udisksmanager.cpp
M +84 -84 tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
M +3 -2 tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp
M +3 -2 tier1/solid/src/solid/backends/upnp/upnpdevicemanager.cpp
M +10 -9 tier1/solid/src/solid/backends/upower/upowerdevice.cpp
M +3 -2 tier1/solid/src/solid/backends/upower/upowermanager.cpp
M +6 -6 tier1/solid/src/solid/backends/wmi/wmibattery.cpp
M +2 -2 tier1/solid/src/solid/backends/wmi/wmidevice.cpp
M +23 -22 tier1/solid/src/solid/deviceinterface.cpp
http://commits.kde.org/kdelibs/2d9b923ab34714359b9d5e9806ac494e66e3bf28
diff --git a/tier1/solid/src/solid/backends/fstab/fstabmanager.cpp \
b/tier1/solid/src/solid/backends/fstab/fstabmanager.cpp index ad1ef4a..46415e0 100644
--- a/tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
+++ b/tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
@@ -25,6 +25,8 @@
#include "fstabservice.h"
#include "fstabwatcher.h"
+#include <QtCore/QCoreApplication>
+
using namespace Solid::Backends::Fstab;
using namespace Solid::Backends::Shared;
@@ -85,8 +87,8 @@ QObject *FstabManager::createDevice(const QString &udi)
if (udi == udiPrefix()) {
RootDevice *root = new RootDevice(FSTAB_UDI_PREFIX);
- root->setProduct(tr("Network Shares"));
- root->setDescription(tr("NFS and SMB shares declared in your system"));
+ root->setProduct(QCoreApplication::translate("", "Network Shares"));
+ root->setDescription(QCoreApplication::translate("", "NFS and SMB shares \
declared in your system")); root->setIcon("folder-remote");
return root;
diff --git a/tier1/solid/src/solid/backends/hal/haldevice.cpp \
b/tier1/solid/src/solid/backends/hal/haldevice.cpp index 0fecac1..8e433d9 100644
--- a/tier1/solid/src/solid/backends/hal/haldevice.cpp
+++ b/tier1/solid/src/solid/backends/hal/haldevice.cpp
@@ -20,6 +20,7 @@
#include "haldevice.h"
+#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusInterface>
@@ -70,31 +71,31 @@ static QString formatByteSize(double size)
{
size /= 1073741824.0;
if ( size > 1024 ) // Tebi-byte
- s = QObject::tr("%1 TiB").arg(QLocale().toString(size / 1024.0, 'f', \
1)); + s = QCoreApplication::translate("", "%1 \
TiB").arg(QLocale().toString(size / 1024.0, 'f', 1)); else
- s = QObject::tr("%1 GiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 \
GiB").arg(QLocale().toString(size, 'f', 1)); }
// Mebi-byte
else if ( size >= 1048576.0 )
{
size /= 1048576.0;
- s = QObject::tr("%1 MiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 MiB").arg(QLocale().toString(size, \
'f', 1)); }
// Kibi-byte
else if ( size >= 1024.0 )
{
size /= 1024.0;
- s = QObject::tr("%1 KiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 KiB").arg(QLocale().toString(size, \
'f', 1)); }
// Just byte
else if ( size > 0 )
{
- s = QObject::tr("%1 B").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 B").arg(QLocale().toString(size, \
'f', 1)); }
// Nothing
else
{
- s = QObject::tr("0 B");
+ s = QCoreApplication::translate("", "0 B");
}
return s;
}
@@ -355,9 +356,9 @@ QString HalDevice::description() const
} else if (category=="volume" || category=="volume.disc") {
return volumeDescription();
} else if (category=="net.80211") {
- return QObject::tr("WLAN Interface");
+ return QCoreApplication::translate("", "WLAN Interface");
} else if (category=="net.80203") {
- return QObject::tr("Networking Interface");
+ return QCoreApplication::translate("", "Networking Interface");
} else {
return product();
}
@@ -573,53 +574,53 @@ QString HalDevice::storageDescription() const
QString first;
QString second;
- first = QObject::tr("CD-ROM", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-ROM", "First item of %1%2 Drive \
sentence"); if (mediumTypes & Solid::OpticalDrive::Cdr)
- first = QObject::tr("CD-R", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-R", "First item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Cdrw)
- first = QObject::tr("CD-RW", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-RW", "First item of %1%2 \
Drive sentence");
if (mediumTypes & Solid::OpticalDrive::Dvd)
- second = QObject::tr("/DVD-ROM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-ROM", "Second item of \
%1%2 Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdplusr)
- second = QObject::tr("/DVD+R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD+R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdplusrw)
- second = QObject::tr("/DVD+RW", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD+RW", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdr)
- second = QObject::tr("/DVD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdrw)
- second = QObject::tr("/DVD-RW", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-RW", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdram)
- second = QObject::tr("/DVD-RAM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-RAM", "Second item of \
%1%2 Drive sentence");
if ((mediumTypes & Solid::OpticalDrive::Dvdr) && (mediumTypes & \
Solid::OpticalDrive::Dvdplusr)) { if(mediumTypes & Solid::OpticalDrive::Dvdplusdl)
- second = QObject::tr("/DVD ±R DL", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/DVD ±R DL", \
"Second item of %1%2 Drive sentence"); else
- second = QObject::tr("/DVD ±R", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/DVD ±R", \
"Second item of %1%2 Drive sentence"); }
if ((mediumTypes & Solid::OpticalDrive::Dvdrw) && (mediumTypes & \
Solid::OpticalDrive::Dvdplusrw)) {
if((mediumTypes & Solid::OpticalDrive::Dvdplusdl) || (mediumTypes & \
Solid::OpticalDrive::Dvdplusdlrw))
- second = QObject::tr("/DVD ±RW DL", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/DVD ±RW DL", \
"Second item of %1%2 Drive sentence"); else
- second = QObject::tr("/DVD ±RW", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/DVD ±RW", \
"Second item of %1%2 Drive sentence"); }
if (mediumTypes & Solid::OpticalDrive::Bd)
- second = QObject::tr("/BD-ROM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-ROM", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Bdr)
- second = QObject::tr("/BD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Bdre)
- second = QObject::tr("/BD-RE", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-RE", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::HdDvd)
- second = QObject::tr("/HD DVD-ROM", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/HD DVD-ROM", \
"Second item of %1%2 Drive sentence"); if (mediumTypes & \
Solid::OpticalDrive::HdDvdr)
- second = QObject::tr("/HD DVD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/HD DVD-R", "Second item of \
%1%2 Drive sentence"); if (mediumTypes & Solid::OpticalDrive::HdDvdrw)
- second = QObject::tr("/HD DVD-RW", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/HD DVD-RW", \
"Second item of %1%2 Drive sentence");
if (drive_is_hotpluggable) {
- description = QObject::tr("External %1%2 Drive", "%1 is CD-ROM/CD-R/etc; \
%2 is '/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second); + \
description = QCoreApplication::translate("", "External %1%2 Drive", "%1 is \
CD-ROM/CD-R/etc; %2 is '/DVD-ROM'/'/DVD-R'/etc (with leading \
slash)").arg(first).arg(second); } else {
- description = QObject::tr("%1%2 Drive", "%1 is CD-ROM/CD-R/etc; %2 is \
'/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second); + \
description = QCoreApplication::translate("", "%1%2 Drive", "%1 is CD-ROM/CD-R/etc; \
%2 is '/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second); }
return description;
@@ -627,9 +628,9 @@ QString HalDevice::storageDescription() const
if (drive_type == Solid::StorageDrive::Floppy) {
if (drive_is_hotpluggable)
- description = QObject::tr("External Floppy Drive");
+ description = QCoreApplication::translate("", "External Floppy Drive");
else
- description = QObject::tr("Floppy Drive");
+ description = QCoreApplication::translate("", "Floppy Drive");
return description;
}
@@ -640,15 +641,15 @@ QString HalDevice::storageDescription() const
QString size_str = formatByteSize(prop("storage.size").toInt());
if (!size_str.isEmpty()) {
if (drive_is_hotpluggable) {
- description = QObject::tr("%1 External Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 External Hard Drive", "%1 is the size").arg(size_str); } else {
- description = QObject::tr("%1 Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 Hard Drive", "%1 is the size").arg(size_str); }
} else {
if (drive_is_hotpluggable)
- description = QObject::tr("External Hard Drive");
+ description = QCoreApplication::translate("", "External Hard \
Drive"); else
- description = QObject::tr("Hard Drive");
+ description = QCoreApplication::translate("", "Hard Drive");
}
return description;
@@ -665,11 +666,11 @@ QString HalDevice::storageDescription() const
if (model.isEmpty())
vendormodel_str = vendor;
else
- vendormodel_str = QObject::tr("%1 %2", "%1 is the vendor, %2 is the \
model of the device").arg(vendor).arg(model); + vendormodel_str = \
QCoreApplication::translate("", "%1 %2", "%1 is the vendor, %2 is the model of the \
device").arg(vendor).arg(model); }
if (vendormodel_str.isEmpty())
- description = QObject::tr("Drive");
+ description = QCoreApplication::translate("", "Drive");
else
description = vendormodel_str;
@@ -697,116 +698,116 @@ QString HalDevice::volumeDescription() const
switch (disc.discType()) {
case Solid::OpticalDisc::UnknownDiscType:
case Solid::OpticalDisc::CdRom:
- description = QObject::tr("CD-ROM");
+ description = QCoreApplication::translate("", "CD-ROM");
break;
case Solid::OpticalDisc::CdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank CD-R");
+ description = QCoreApplication::translate("", "Blank CD-R");
else
- description = QObject::tr("CD-R");
+ description = QCoreApplication::translate("", "CD-R");
break;
case Solid::OpticalDisc::CdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank CD-RW");
+ description = QCoreApplication::translate("", "Blank CD-RW");
else
- description = QObject::tr("CD-RW");
+ description = QCoreApplication::translate("", "CD-RW");
break;
case Solid::OpticalDisc::DvdRom:
- description = QObject::tr("DVD-ROM");
+ description = QCoreApplication::translate("", "DVD-ROM");
break;
case Solid::OpticalDisc::DvdRam:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-RAM");
+ description = QCoreApplication::translate("", "Blank DVD-RAM");
else
- description = QObject::tr("DVD-RAM");
+ description = QCoreApplication::translate("", "DVD-RAM");
break;
case Solid::OpticalDisc::DvdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-R");
+ description = QCoreApplication::translate("", "Blank DVD-R");
else
- description = QObject::tr("DVD-R");
+ description = QCoreApplication::translate("", "DVD-R");
break;
case Solid::OpticalDisc::DvdPlusRecordableDuallayer:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+R Dual-Layer");
+ description = QCoreApplication::translate("", "Blank DVD+R \
Dual-Layer"); else
- description = QObject::tr("DVD+R Dual-Layer");
+ description = QCoreApplication::translate("", "DVD+R \
Dual-Layer"); break;
case Solid::OpticalDisc::DvdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-RW");
+ description = QCoreApplication::translate("", "Blank DVD-RW");
else
- description = QObject::tr("DVD-RW");
+ description = QCoreApplication::translate("", "DVD-RW");
break;
case Solid::OpticalDisc::DvdPlusRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+R");
+ description = QCoreApplication::translate("", "Blank DVD+R");
else
- description = QObject::tr("DVD+R");
+ description = QCoreApplication::translate("", "DVD+R");
break;
case Solid::OpticalDisc::DvdPlusRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+RW");
+ description = QCoreApplication::translate("", "Blank DVD+RW");
else
- description = QObject::tr("DVD+RW");
+ description = QCoreApplication::translate("", "DVD+RW");
break;
case Solid::OpticalDisc::DvdPlusRewritableDuallayer:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+RW Dual-Layer");
+ description = QCoreApplication::translate("", "Blank DVD+RW \
Dual-Layer"); else
- description = QObject::tr("DVD+RW Dual-Layer");
+ description = QCoreApplication::translate("", "DVD+RW \
Dual-Layer"); break;
case Solid::OpticalDisc::BluRayRom:
- description = QObject::tr("BD-ROM");
+ description = QCoreApplication::translate("", "BD-ROM");
break;
case Solid::OpticalDisc::BluRayRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank BD-R");
+ description = QCoreApplication::translate("", "Blank BD-R");
else
- description = QObject::tr("BD-R");
+ description = QCoreApplication::translate("", "BD-R");
break;
case Solid::OpticalDisc::BluRayRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank BD-RE");
+ description = QCoreApplication::translate("", "Blank BD-RE");
else
- description = QObject::tr("BD-RE");
+ description = QCoreApplication::translate("", "BD-RE");
break;
case Solid::OpticalDisc::HdDvdRom:
- description = QObject::tr("HD DVD-ROM");
+ description = QCoreApplication::translate("", "HD DVD-ROM");
break;
case Solid::OpticalDisc::HdDvdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank HD DVD-R");
+ description = QCoreApplication::translate("", "Blank HD DVD-R");
else
- description = QObject::tr("HD DVD-R");
+ description = QCoreApplication::translate("", "HD DVD-R");
break;
case Solid::OpticalDisc::HdDvdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank HD DVD-RW");
+ description = QCoreApplication::translate("", "Blank HD \
DVD-RW"); else
- description = QObject::tr("HD DVD-RW");
+ description = QCoreApplication::translate("", "HD DVD-RW");
break;
}
/* Special case for pure audio disc */
if (disc.availableContent() == Solid::OpticalDisc::Audio) {
- description = QObject::tr("Audio CD");
+ description = QCoreApplication::translate("", "Audio CD");
}
return description;
@@ -819,28 +820,28 @@ QString HalDevice::volumeDescription() const
QString size_str = formatByteSize(prop("volume.size").toULongLong());
if (drive_is_encrypted_container) {
if (!size_str.isEmpty()) {
- description = QObject::tr("%1 Encrypted Container", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", "%1 \
Encrypted Container", "%1 is the size").arg(size_str); } else {
- description = QObject::tr("Encrypted Container");
+ description = QCoreApplication::translate("", "Encrypted Container");
}
} else if (drive_type == Solid::StorageDrive::HardDisk && !drive_is_removable) {
if (!size_str.isEmpty()) {
if (drive_is_hotpluggable) {
- description = QObject::tr("%1 External Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 External Hard Drive", "%1 is the size").arg(size_str); } else {
- description = QObject::tr("%1 Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 Hard Drive", "%1 is the size").arg(size_str); }
} else {
if (drive_is_hotpluggable)
- description = QObject::tr("External Hard Drive");
+ description = QCoreApplication::translate("", "External Hard \
Drive"); else
- description = QObject::tr("Hard Drive");
+ description = QCoreApplication::translate("", "Hard Drive");
}
} else {
if (drive_is_removable) {
- description = QObject::tr("%1 Removable Media", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", "%1 \
Removable Media", "%1 is the size").arg(size_str); } else {
- description = QObject::tr("%1 Media", "%1 is the size").arg(size_str);
+ description = QCoreApplication::translate("", "%1 Media", "%1 is the \
size").arg(size_str); }
}
diff --git a/tier1/solid/src/solid/backends/kupnp/internetgatewaydevice1.cpp \
b/tier1/solid/src/solid/backends/kupnp/internetgatewaydevice1.cpp index \
1d7baf4..2cff307 100644
--- a/tier1/solid/src/solid/backends/kupnp/internetgatewaydevice1.cpp
+++ b/tier1/solid/src/solid/backends/kupnp/internetgatewaydevice1.cpp
@@ -63,7 +63,7 @@ QString InternetGatewayDevice1::icon() const
QString InternetGatewayDevice1::description() const
{
- return QObject::tr("UPnP Internet Gateway Device");
+ return QCoreApplication::translate("", "UPnP Internet Gateway Device");
}
diff --git a/tier1/solid/src/solid/backends/kupnp/kupnpdevice.cpp \
b/tier1/solid/src/solid/backends/kupnp/kupnpdevice.cpp index 2aa0146..2587809 100644
--- a/tier1/solid/src/solid/backends/kupnp/kupnpdevice.cpp
+++ b/tier1/solid/src/solid/backends/kupnp/kupnpdevice.cpp
@@ -26,8 +26,6 @@
#include <QtCore/QStringList>
#include <QtCore/QDebug>
-#define QI18N(x) x
-
namespace Solid
{
namespace Backends
@@ -45,27 +43,27 @@ struct DeviceData
static const
DeviceData deviceData[] =
{
- {"BasicDevice1", "network-server", QI18N("UPnP Basic Device") },
- {"WLANAccessPointDevice1", "network-wireless", QI18N("UPnP WLAN Access Point \
Device") },
- {"PrinterBasic1", "printer", QI18N("UPnP Printer (Basic)") },
- {"PrinterEnhanced1", "printer", QI18N("UPnP Printer (Enhanced)") },
- {"Scanner1", "scanner", QI18N("UPnP Scanner") },
- {"MediaRenderer1", "video-television", QI18N("UPnP Media Renderer") },
- {"MediaRenderer2", "video-television", QI18N("UPnP Media Renderer") },
- {"SolarProtectionBlind1", "device", QI18N("UPnP Solar Protection Blind") },
- {"DigitalSecurityCamera1", "camera", QI18N("UPnP Digital Security Camera") },
- {"HVAC1", "device", QI18N("UPnP HVAC") },
- {"LightingControls1", "light", QI18N("UPnP Lighting Controls") },
- {"RemoteUIClientDevice1", "device", QI18N("UPnP Remote UI Client") },
- {"RemoteUIServerDevice1", "device", QI18N("UPnP Remote UI Server") },
- {"RAClient1", "device", QI18N("UPnP Remote Access Client") },
- {"RAServer1", "device", QI18N("UPnP Remote Access Server") },
- {"RADiscoveryAgent1", "device", QI18N("UPnP Remote Access Discovery Agent") },
- {"Unknown", "device", QI18N("Unknown UPnP Device") },
- {"LANDevice1", "network-wired", QI18N("UPnP LAN Device") },
- {"WANDevice1", "network-wired", QI18N("UPnP WAN Device") },
- {"WANConnectionDevice1", "network-wired", QI18N("UPnP WAN Connection Device") },
- {"WFADevice1", "network-wireless", QI18N("UPnP Wi-Fi Alliance Device") }
+ {"BasicDevice1", "network-server", Q_TRANSLATE_NOOP("", "UPnP Basic Device") },
+ {"WLANAccessPointDevice1", "network-wireless", Q_TRANSLATE_NOOP("", "UPnP WLAN \
Access Point Device") }, + {"PrinterBasic1", "printer", Q_TRANSLATE_NOOP("", "UPnP \
Printer (Basic)") }, + {"PrinterEnhanced1", "printer", Q_TRANSLATE_NOOP("", "UPnP \
Printer (Enhanced)") }, + {"Scanner1", "scanner", Q_TRANSLATE_NOOP("", "UPnP \
Scanner") }, + {"MediaRenderer1", "video-television", Q_TRANSLATE_NOOP("", "UPnP \
Media Renderer") }, + {"MediaRenderer2", "video-television", Q_TRANSLATE_NOOP("", \
"UPnP Media Renderer") }, + {"SolarProtectionBlind1", "device", \
Q_TRANSLATE_NOOP("", "UPnP Solar Protection Blind") }, + \
{"DigitalSecurityCamera1", "camera", Q_TRANSLATE_NOOP("", "UPnP Digital Security \
Camera") }, + {"HVAC1", "device", Q_TRANSLATE_NOOP("", "UPnP HVAC") },
+ {"LightingControls1", "light", Q_TRANSLATE_NOOP("", "UPnP Lighting Controls") },
+ {"RemoteUIClientDevice1", "device", Q_TRANSLATE_NOOP("", "UPnP Remote UI \
Client") }, + {"RemoteUIServerDevice1", "device", Q_TRANSLATE_NOOP("", "UPnP \
Remote UI Server") }, + {"RAClient1", "device", Q_TRANSLATE_NOOP("", "UPnP Remote \
Access Client") }, + {"RAServer1", "device", Q_TRANSLATE_NOOP("", "UPnP Remote \
Access Server") }, + {"RADiscoveryAgent1", "device", Q_TRANSLATE_NOOP("", "UPnP \
Remote Access Discovery Agent") }, + {"Unknown", "device", Q_TRANSLATE_NOOP("", \
"Unknown UPnP Device") }, + {"LANDevice1", "network-wired", Q_TRANSLATE_NOOP("", \
"UPnP LAN Device") }, + {"WANDevice1", "network-wired", Q_TRANSLATE_NOOP("", "UPnP \
WAN Device") }, + {"WANConnectionDevice1", "network-wired", Q_TRANSLATE_NOOP("", \
"UPnP WAN Connection Device") }, + {"WFADevice1", "network-wireless", \
Q_TRANSLATE_NOOP("", "UPnP Wi-Fi Alliance Device") } };
diff --git a/tier1/solid/src/solid/backends/kupnp/kupnprootdevice.cpp \
b/tier1/solid/src/solid/backends/kupnp/kupnprootdevice.cpp index ce48184..664e72e \
100644
--- a/tier1/solid/src/solid/backends/kupnp/kupnprootdevice.cpp
+++ b/tier1/solid/src/solid/backends/kupnp/kupnprootdevice.cpp
@@ -24,8 +24,6 @@
#include <QtCore/QStringList>
#include <QtCore/QDebug>
-#define QI18N(x) x
-
namespace Solid
{
namespace Backends
@@ -52,7 +50,7 @@ QString KUPnPRootDevice::vendor() const { return QString(); }
QString KUPnPRootDevice::product() const
{
- return QObject::tr("UPnP devices");
+ return QCoreApplication::translate("", "UPnP devices");
}
QString KUPnPRootDevice::icon() const
diff --git a/tier1/solid/src/solid/backends/kupnp/mediaserver1.cpp \
b/tier1/solid/src/solid/backends/kupnp/mediaserver1.cpp index 02d8e55..28e8267 100644
--- a/tier1/solid/src/solid/backends/kupnp/mediaserver1.cpp
+++ b/tier1/solid/src/solid/backends/kupnp/mediaserver1.cpp
@@ -76,7 +76,7 @@ QString MediaServer1::icon() const
QString MediaServer1::description() const
{
- return QObject::tr("UPnP Media Server v1");
+ return QCoreApplication::translate("", "UPnP Media Server v1");
}
diff --git a/tier1/solid/src/solid/backends/kupnp/mediaserver2.cpp \
b/tier1/solid/src/solid/backends/kupnp/mediaserver2.cpp index fd91b09..9967680 100644
--- a/tier1/solid/src/solid/backends/kupnp/mediaserver2.cpp
+++ b/tier1/solid/src/solid/backends/kupnp/mediaserver2.cpp
@@ -77,7 +77,7 @@ QString MediaServer2::icon() const
QString MediaServer2::description() const
{
- return QObject::tr("UPnP Media Server v2");
+ return QCoreApplication::translate("", "UPnP Media Server v2");
}
diff --git a/tier1/solid/src/solid/backends/kupnp/mediaserver3.cpp \
b/tier1/solid/src/solid/backends/kupnp/mediaserver3.cpp index cd5ad31..3805a5c 100644
--- a/tier1/solid/src/solid/backends/kupnp/mediaserver3.cpp
+++ b/tier1/solid/src/solid/backends/kupnp/mediaserver3.cpp
@@ -76,7 +76,7 @@ QString MediaServer3::icon() const
QString MediaServer3::description() const
{
- return QObject::tr("UPnP Media Server v3");
+ return QCoreApplication::translate("", "UPnP Media Server v3");
}
diff --git a/tier1/solid/src/solid/backends/udev/udevdevice.cpp \
b/tier1/solid/src/solid/backends/udev/udevdevice.cpp index 21b9743..4b1e4a0 100644
--- a/tier1/solid/src/solid/backends/udev/udevdevice.cpp
+++ b/tier1/solid/src/solid/backends/udev/udevdevice.cpp
@@ -173,16 +173,16 @@ QStringList UDevDevice::emblems() const
QString UDevDevice::description() const
{
if (parentUdi().isEmpty()) {
- return QObject::tr("Computer");
+ return QCoreApplication::translate("", "Computer");
}
if (queryDeviceInterface(Solid::DeviceInterface::Processor)) {
- return QObject::tr("Processor");
+ return QCoreApplication::translate("", "Processor");
} else if (queryDeviceInterface(Solid::DeviceInterface::PortableMediaPlayer)) {
// TODO: check out special cases like iPod
- return QObject::tr("Portable Media Player");
+ return QCoreApplication::translate("", "Portable Media Player");
} else if (queryDeviceInterface(Solid::DeviceInterface::Camera)) {
- return QObject::tr("Camera");
+ return QCoreApplication::translate("", "Camera");
} else if (queryDeviceInterface(Solid::DeviceInterface::Video)) {
return product();
} else if (queryDeviceInterface(Solid::DeviceInterface::AudioInterface)) {
@@ -190,9 +190,9 @@ QString UDevDevice::description() const
} else if (queryDeviceInterface(Solid::DeviceInterface::NetworkInterface)) {
const NetworkInterface networkIface(const_cast<UDevDevice *>(this));
if (networkIface.isWireless()) {
- return QObject::tr("WLAN Interface");
+ return QCoreApplication::translate("", "WLAN Interface");
}
- return QObject::tr("Networking Interface");
+ return QCoreApplication::translate("", "Networking Interface");
}
return QString();
diff --git a/tier1/solid/src/solid/backends/udev/udevmanager.cpp \
b/tier1/solid/src/solid/backends/udev/udevmanager.cpp index c29f175..5e71c70 100644
--- a/tier1/solid/src/solid/backends/udev/udevmanager.cpp
+++ b/tier1/solid/src/solid/backends/udev/udevmanager.cpp
@@ -24,6 +24,7 @@
#include "udevdevice.h"
#include "../shared/rootdevice.h"
+#include <QtCore/QCoreApplication>
#include <QtCore/QSet>
#include <QtCore/QFile>
#include <QtCore/QDebug>
@@ -182,8 +183,8 @@ QObject *UDevManager::createDevice(const QString &udi_)
{
if (udi_ == udiPrefix()) {
RootDevice *const device = new RootDevice(UDEV_UDI_PREFIX);
- device->setProduct(tr("Devices"));
- device->setDescription(tr("Devices declared in your system"));
+ device->setProduct(QCoreApplication::translate("", "Devices"));
+ device->setDescription(QCoreApplication::translate("", "Devices declared in \
your system")); device->setIcon("computer");
return device;
}
diff --git a/tier1/solid/src/solid/backends/udisks/udisksdevice.cpp \
b/tier1/solid/src/solid/backends/udisks/udisksdevice.cpp index 20d5654..2c30ecd \
100644
--- a/tier1/solid/src/solid/backends/udisks/udisksdevice.cpp
+++ b/tier1/solid/src/solid/backends/udisks/udisksdevice.cpp
@@ -32,6 +32,7 @@
#include <solid/deviceinterface.h>
#include <solid/device.h>
+#include <QtCore/QCoreApplication>
#include <QtCore/QStringList>
#include <QtCore/QDebug>
@@ -58,31 +59,31 @@ static QString formatByteSize(double size)
{
size /= 1073741824.0;
if ( size > 1024 ) // Tebi-byte
- s = QObject::tr("%1 TiB").arg(QLocale().toString(size / 1024.0, 'f', \
1)); + s = QCoreApplication::translate("", "%1 \
TiB").arg(QLocale().toString(size / 1024.0, 'f', 1)); else
- s = QObject::tr("%1 GiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 \
GiB").arg(QLocale().toString(size, 'f', 1)); }
// Mebi-byte
else if ( size >= 1048576.0 )
{
size /= 1048576.0;
- s = QObject::tr("%1 MiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 MiB").arg(QLocale().toString(size, \
'f', 1)); }
// Kibi-byte
else if ( size >= 1024.0 )
{
size /= 1024.0;
- s = QObject::tr("%1 KiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 KiB").arg(QLocale().toString(size, \
'f', 1)); }
// Just byte
else if ( size > 0 )
{
- s = QObject::tr("%1 B").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 B").arg(QLocale().toString(size, \
'f', 1)); }
// Nothing
else
{
- s = QObject::tr("0 B");
+ s = QCoreApplication::translate("", "0 B");
}
return s;
}
@@ -242,24 +243,24 @@ QString UDisksDevice::storageDescription() const
QString first;
QString second;
- first = QObject::tr("CD-ROM", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-ROM", "First item of %1%2 Drive \
sentence"); if (mediumTypes & Solid::OpticalDrive::Cdr)
- first = QObject::tr("CD-R", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-R", "First item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Cdrw)
- first = QObject::tr("CD-RW", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-RW", "First item of %1%2 \
Drive sentence");
if (mediumTypes & Solid::OpticalDrive::Dvd)
- second = QObject::tr("/DVD-ROM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-ROM", "Second item of \
%1%2 Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdplusr)
- second = QObject::tr("/DVD+R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD+R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdplusrw)
- second = QObject::tr("/DVD+RW", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD+RW", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdr)
- second = QObject::tr("/DVD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdrw)
- second = QObject::tr("/DVD-RW", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-RW", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdram)
- second = QObject::tr("/DVD-RAM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-RAM", "Second item of \
%1%2 Drive sentence");
if ((mediumTypes & Solid::OpticalDrive::Dvdr) && (mediumTypes & \
Solid::OpticalDrive::Dvdplusr)) {
if(mediumTypes & Solid::OpticalDrive::Dvdplusdl)
@@ -275,22 +276,22 @@ QString UDisksDevice::storageDescription() const
second = QObject::trUtf8("/DVD ±RW", "Second item of %1%2 Drive \
sentence"); }
if (mediumTypes & Solid::OpticalDrive::Bd)
- second = QObject::tr("/BD-ROM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-ROM", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Bdr)
- second = QObject::tr("/BD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Bdre)
- second = QObject::tr("/BD-RE", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-RE", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::HdDvd)
- second = QObject::tr("/HD DVD-ROM", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/HD DVD-ROM", \
"Second item of %1%2 Drive sentence"); if (mediumTypes & \
Solid::OpticalDrive::HdDvdr)
- second = QObject::tr("/HD DVD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/HD DVD-R", "Second item of \
%1%2 Drive sentence"); if (mediumTypes & Solid::OpticalDrive::HdDvdrw)
- second = QObject::tr("/HD DVD-RW", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/HD DVD-RW", \
"Second item of %1%2 Drive sentence");
if (drive_is_hotpluggable)
- description = QObject::tr("External %1%2 Drive", "%1 is CD-ROM/CD-R/etc; \
%2 is '/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second); + \
description = QCoreApplication::translate("", "External %1%2 Drive", "%1 is \
CD-ROM/CD-R/etc; %2 is '/DVD-ROM'/'/DVD-R'/etc (with leading \
slash)").arg(first).arg(second); else
- description = QObject::tr("%1%2 Drive", "%1 is CD-ROM/CD-R/etc; %2 is \
'/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second); + \
description = QCoreApplication::translate("", "%1%2 Drive", "%1 is CD-ROM/CD-R/etc; \
%2 is '/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second);
return description;
}
@@ -298,9 +299,9 @@ QString UDisksDevice::storageDescription() const
if (drive_type == Solid::StorageDrive::Floppy)
{
if (drive_is_hotpluggable)
- description = QObject::tr("External Floppy Drive");
+ description = QCoreApplication::translate("", "External Floppy Drive");
else
- description = QObject::tr("Floppy Drive");
+ description = QCoreApplication::translate("", "Floppy Drive");
return description;
}
@@ -313,14 +314,14 @@ QString UDisksDevice::storageDescription() const
if (!size_str.isEmpty())
{
if (drive_is_hotpluggable)
- description = QObject::tr("%1 External Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 External Hard Drive", "%1 is the size").arg(size_str); else
- description = QObject::tr("%1 Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 Hard Drive", "%1 is the size").arg(size_str); } else {
if (drive_is_hotpluggable)
- description = QObject::tr("External Hard Drive");
+ description = QCoreApplication::translate("", "External Hard \
Drive"); else
- description = QObject::tr("Hard Drive");
+ description = QCoreApplication::translate("", "Hard Drive");
}
return description;
@@ -348,13 +349,13 @@ QString UDisksDevice::storageDescription() const
}
else
{
- vendormodel_str = QObject::tr("%1 %2", "%1 is the vendor, %2 is the \
model of the device").arg(vendor_str).arg(model); + vendormodel_str = \
QCoreApplication::translate("", "%1 %2", "%1 is the vendor, %2 is the model of the \
device").arg(vendor_str).arg(model); }
}
}
if (vendormodel_str.isEmpty())
- description = QObject::tr("Drive");
+ description = QCoreApplication::translate("", "Drive");
else
description = vendormodel_str;
@@ -382,116 +383,116 @@ QString UDisksDevice::volumeDescription() const
{
case Solid::OpticalDisc::UnknownDiscType:
case Solid::OpticalDisc::CdRom:
- description = QObject::tr("CD-ROM");
+ description = QCoreApplication::translate("", "CD-ROM");
break;
case Solid::OpticalDisc::CdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank CD-R");
+ description = QCoreApplication::translate("", "Blank CD-R");
else
- description = QObject::tr("CD-R");
+ description = QCoreApplication::translate("", "CD-R");
break;
case Solid::OpticalDisc::CdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank CD-RW");
+ description = QCoreApplication::translate("", "Blank CD-RW");
else
- description = QObject::tr("CD-RW");
+ description = QCoreApplication::translate("", "CD-RW");
break;
case Solid::OpticalDisc::DvdRom:
- description = QObject::tr("DVD-ROM");
+ description = QCoreApplication::translate("", "DVD-ROM");
break;
case Solid::OpticalDisc::DvdRam:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-RAM");
+ description = QCoreApplication::translate("", "Blank DVD-RAM");
else
- description = QObject::tr("DVD-RAM");
+ description = QCoreApplication::translate("", "DVD-RAM");
break;
case Solid::OpticalDisc::DvdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-R");
+ description = QCoreApplication::translate("", "Blank DVD-R");
else
- description = QObject::tr("DVD-R");
+ description = QCoreApplication::translate("", "DVD-R");
break;
case Solid::OpticalDisc::DvdPlusRecordableDuallayer:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+R Dual-Layer");
+ description = QCoreApplication::translate("", "Blank DVD+R \
Dual-Layer"); else
- description = QObject::tr("DVD+R Dual-Layer");
+ description = QCoreApplication::translate("", "DVD+R \
Dual-Layer"); break;
case Solid::OpticalDisc::DvdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-RW");
+ description = QCoreApplication::translate("", "Blank DVD-RW");
else
- description = QObject::tr("DVD-RW");
+ description = QCoreApplication::translate("", "DVD-RW");
break;
case Solid::OpticalDisc::DvdPlusRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+R");
+ description = QCoreApplication::translate("", "Blank DVD+R");
else
- description = QObject::tr("DVD+R");
+ description = QCoreApplication::translate("", "DVD+R");
break;
case Solid::OpticalDisc::DvdPlusRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+RW");
+ description = QCoreApplication::translate("", "Blank DVD+RW");
else
- description = QObject::tr("DVD+RW");
+ description = QCoreApplication::translate("", "DVD+RW");
break;
case Solid::OpticalDisc::DvdPlusRewritableDuallayer:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+RW Dual-Layer");
+ description = QCoreApplication::translate("", "Blank DVD+RW \
Dual-Layer"); else
- description = QObject::tr("DVD+RW Dual-Layer");
+ description = QCoreApplication::translate("", "DVD+RW \
Dual-Layer"); break;
case Solid::OpticalDisc::BluRayRom:
- description = QObject::tr("BD-ROM");
+ description = QCoreApplication::translate("", "BD-ROM");
break;
case Solid::OpticalDisc::BluRayRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank BD-R");
+ description = QCoreApplication::translate("", "Blank BD-R");
else
- description = QObject::tr("BD-R");
+ description = QCoreApplication::translate("", "BD-R");
break;
case Solid::OpticalDisc::BluRayRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank BD-RE");
+ description = QCoreApplication::translate("", "Blank BD-RE");
else
- description = QObject::tr("BD-RE");
+ description = QCoreApplication::translate("", "BD-RE");
break;
case Solid::OpticalDisc::HdDvdRom:
- description = QObject::tr("HD DVD-ROM");
+ description = QCoreApplication::translate("", "HD DVD-ROM");
break;
case Solid::OpticalDisc::HdDvdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank HD DVD-R");
+ description = QCoreApplication::translate("", "Blank HD DVD-R");
else
- description = QObject::tr("HD DVD-R");
+ description = QCoreApplication::translate("", "HD DVD-R");
break;
case Solid::OpticalDisc::HdDvdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank HD DVD-RW");
+ description = QCoreApplication::translate("", "Blank HD \
DVD-RW"); else
- description = QObject::tr("HD DVD-RW");
+ description = QCoreApplication::translate("", "HD DVD-RW");
break;
}
// Special case for pure audio disc
if (disc.availableContent() == Solid::OpticalDisc::Audio)
- description = QObject::tr("Audio CD");
+ description = QCoreApplication::translate("", "Audio CD");
return description;
}
@@ -504,33 +505,33 @@ QString UDisksDevice::volumeDescription() const
if (drive_is_encrypted_container)
{
if (!size_str.isEmpty())
- description = QObject::tr("%1 Encrypted Container", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", "%1 \
Encrypted Container", "%1 is the size").arg(size_str); else
- description = QObject::tr("Encrypted Container");
+ description = QCoreApplication::translate("", "Encrypted Container");
}
else if (drive_type == Solid::StorageDrive::HardDisk && !drive_is_removable)
{
if (!size_str.isEmpty())
{
if (drive_is_hotpluggable)
- description = QObject::tr("%1 External Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 External Hard Drive", "%1 is the size").arg(size_str); else
- description = QObject::tr("%1 Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 Hard Drive", "%1 is the size").arg(size_str); }
else
{
if (drive_is_hotpluggable)
- description = QObject::tr("External Hard Drive");
+ description = QCoreApplication::translate("", "External Hard \
Drive"); else
- description = QObject::tr("Hard Drive");
+ description = QCoreApplication::translate("", "Hard Drive");
}
}
else
{
if (drive_is_removable)
- description = QObject::tr("%1 Removable Media", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", "%1 \
Removable Media", "%1 is the size").arg(size_str); else
- description = QObject::tr("%1 Media", "%1 is the size").arg(size_str);
+ description = QCoreApplication::translate("", "%1 Media", "%1 is the \
size").arg(size_str); }
return description;
@@ -745,19 +746,19 @@ bool UDisksDevice::isDeviceBlacklisted() const
QString UDisksDevice::errorToString(const QString & error) const
{
if (error == UD_ERROR_UNAUTHORIZED)
- return QObject::tr("You are not authorized to perform this operation.");
+ return QCoreApplication::translate("", "You are not authorized to perform \
this operation."); else if (error == UD_ERROR_BUSY)
- return QObject::tr("The device is currently busy.");
+ return QCoreApplication::translate("", "The device is currently busy.");
else if (error == UD_ERROR_FAILED)
- return QObject::tr("The requested operation has failed.");
+ return QCoreApplication::translate("", "The requested operation has \
failed."); else if (error == UD_ERROR_CANCELED)
- return QObject::tr("The requested operation has been canceled.");
+ return QCoreApplication::translate("", "The requested operation has been \
canceled."); else if (error == UD_ERROR_INVALID_OPTION)
- return QObject::tr("An invalid or malformed option has been given.");
+ return QCoreApplication::translate("", "An invalid or malformed option has \
been given."); else if (error == UD_ERROR_MISSING_DRIVER)
- return QObject::tr("The kernel driver for this filesystem type is not \
available."); + return QCoreApplication::translate("", "The kernel driver for \
this filesystem type is not available."); else
- return QObject::tr("An unspecified error has occurred.");
+ return QCoreApplication::translate("", "An unspecified error has \
occurred."); }
Solid::ErrorType UDisksDevice::errorToSolidError(const QString & error) const
diff --git a/tier1/solid/src/solid/backends/udisks/udisksmanager.cpp \
b/tier1/solid/src/solid/backends/udisks/udisksmanager.cpp index 28f7bda..b049e21 \
100644
--- a/tier1/solid/src/solid/backends/udisks/udisksmanager.cpp
+++ b/tier1/solid/src/solid/backends/udisks/udisksmanager.cpp
@@ -22,6 +22,7 @@
#include "udisksmanager.h"
#include "udisks.h"
+#include QtCore/QCoreApplication>
#include <QtDBus/QDBusReply>
#include <QtCore/QDebug>
#include <QtDBus/QDBusMetaType>
@@ -86,8 +87,8 @@ QObject* UDisksManager::createDevice(const QString& udi)
if (udi==udiPrefix()) {
RootDevice *root = new RootDevice(udi);
- root->setProduct(tr("Storage"));
- root->setDescription(tr("Storage devices"));
+ root->setProduct(QCoreApplication::translate("", "Storage"));
+ root->setDescription(QCoreApplication::tranlsate("", "Storage devices"));
root->setIcon("server-database"); // Obviously wasn't meant for that, but \
maps nicely in oxygen icon set :-p
return root;
diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp \
b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp index 3076278..22b0c45 \
100644
--- a/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
+++ b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
@@ -60,31 +60,31 @@ static QString formatByteSize(double size)
{
size /= 1073741824.0;
if ( size > 1024 ) // Tebi-byte
- s = QObject::tr("%1 TiB").arg(QLocale().toString(size / 1024.0, 'f', \
1)); + s = QCoreApplication::translate("", "%1 \
TiB").arg(QLocale().toString(size / 1024.0, 'f', 1)); else
- s = QObject::tr("%1 GiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 \
GiB").arg(QLocale().toString(size, 'f', 1)); }
// Mebi-byte
else if ( size >= 1048576.0 )
{
size /= 1048576.0;
- s = QObject::tr("%1 MiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 MiB").arg(QLocale().toString(size, \
'f', 1)); }
// Kibi-byte
else if ( size >= 1024.0 )
{
size /= 1024.0;
- s = QObject::tr("%1 KiB").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 KiB").arg(QLocale().toString(size, \
'f', 1)); }
// Just byte
else if ( size > 0 )
{
- s = QObject::tr("%1 B").arg(QLocale().toString(size, 'f', 1));
+ s = QCoreApplication::translate("", "%1 B").arg(QLocale().toString(size, \
'f', 1)); }
// Nothing
else
{
- s = QObject::tr("0 B");
+ s = QCoreApplication::translate("", "0 B");
}
return s;
}
@@ -227,24 +227,24 @@ QString Device::storageDescription() const
QString first;
QString second;
- first = QObject::tr("CD-ROM", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-ROM", "First item of %1%2 Drive \
sentence"); if (mediumTypes & Solid::OpticalDrive::Cdr)
- first = QObject::tr("CD-R", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-R", "First item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Cdrw)
- first = QObject::tr("CD-RW", "First item of %1%2 Drive sentence");
+ first = QCoreApplication::translate("", "CD-RW", "First item of %1%2 \
Drive sentence");
if (mediumTypes & Solid::OpticalDrive::Dvd)
- second = QObject::tr("/DVD-ROM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-ROM", "Second item of \
%1%2 Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdplusr)
- second = QObject::tr("/DVD+R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD+R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdplusrw)
- second = QObject::tr("/DVD+RW", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD+RW", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdr)
- second = QObject::tr("/DVD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdrw)
- second = QObject::tr("/DVD-RW", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-RW", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Dvdram)
- second = QObject::tr("/DVD-RAM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/DVD-RAM", "Second item of \
%1%2 Drive sentence");
if ((mediumTypes & Solid::OpticalDrive::Dvdr) && (mediumTypes & \
Solid::OpticalDrive::Dvdplusr)) {
if(mediumTypes & Solid::OpticalDrive::Dvdplusdl)
@@ -260,22 +260,22 @@ QString Device::storageDescription() const
second = QObject::trUtf8("/DVD ±RW", "Second item of %1%2 Drive \
sentence"); }
if (mediumTypes & Solid::OpticalDrive::Bd)
- second = QObject::tr("/BD-ROM", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-ROM", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Bdr)
- second = QObject::tr("/BD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-R", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::Bdre)
- second = QObject::tr("/BD-RE", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/BD-RE", "Second item of %1%2 \
Drive sentence"); if (mediumTypes & Solid::OpticalDrive::HdDvd)
- second = QObject::tr("/HD DVD-ROM", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/HD DVD-ROM", \
"Second item of %1%2 Drive sentence"); if (mediumTypes & \
Solid::OpticalDrive::HdDvdr)
- second = QObject::tr("/HD DVD-R", "Second item of %1%2 Drive sentence");
+ second = QCoreApplication::translate("", "/HD DVD-R", "Second item of \
%1%2 Drive sentence"); if (mediumTypes & Solid::OpticalDrive::HdDvdrw)
- second = QObject::tr("/HD DVD-RW", "Second item of %1%2 Drive \
sentence"); + second = QCoreApplication::translate("", "/HD DVD-RW", \
"Second item of %1%2 Drive sentence");
if (drive_is_hotpluggable)
- description = QObject::tr("External %1%2 Drive", "%1 is CD-ROM/CD-R/etc; \
%2 is '/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second); + \
description = QCoreApplication::translate("", "External %1%2 Drive", "%1 is \
CD-ROM/CD-R/etc; %2 is '/DVD-ROM'/'/DVD-R'/etc (with leading \
slash)").arg(first).arg(second); else
- description = QObject::tr("%1%2 Drive", "%1 is CD-ROM/CD-R/etc; %2 is \
'/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second); + \
description = QCoreApplication::translate("", "%1%2 Drive", "%1 is CD-ROM/CD-R/etc; \
%2 is '/DVD-ROM'/'/DVD-R'/etc (with leading slash)").arg(first).arg(second);
return description;
}
@@ -283,9 +283,9 @@ QString Device::storageDescription() const
if (drive_type == Solid::StorageDrive::Floppy)
{
if (drive_is_hotpluggable)
- description = QObject::tr("External Floppy Drive");
+ description = QCoreApplication::translate("", "External Floppy Drive");
else
- description = QObject::tr("Floppy Drive");
+ description = QCoreApplication::translate("", "Floppy Drive");
return description;
}
@@ -298,14 +298,14 @@ QString Device::storageDescription() const
if (!size_str.isEmpty())
{
if (drive_is_hotpluggable)
- description = QObject::tr("%1 External Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 External Hard Drive", "%1 is the size").arg(size_str); else
- description = QObject::tr("%1 Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 Hard Drive", "%1 is the size").arg(size_str); } else {
if (drive_is_hotpluggable)
- description = QObject::tr("External Hard Drive");
+ description = QCoreApplication::translate("", "External Hard \
Drive"); else
- description = QObject::tr("Hard Drive");
+ description = QCoreApplication::translate("", "Hard Drive");
}
return description;
@@ -333,13 +333,13 @@ QString Device::storageDescription() const
}
else
{
- vendormodel_str = QObject::tr("%1 %2", "%1 is the vendor, %2 is the \
model of the device").arg(vendor_str).arg(model); + vendormodel_str = \
QCoreApplication::translate("", "%1 %2", "%1 is the vendor, %2 is the model of the \
device").arg(vendor_str).arg(model); }
}
}
if (vendormodel_str.isEmpty())
- description = QObject::tr("Drive");
+ description = QCoreApplication::translate("", "Drive");
else
description = vendormodel_str;
@@ -368,116 +368,116 @@ QString Device::volumeDescription() const
{
case Solid::OpticalDisc::UnknownDiscType:
case Solid::OpticalDisc::CdRom:
- description = QObject::tr("CD-ROM");
+ description = QCoreApplication::translate("", "CD-ROM");
break;
case Solid::OpticalDisc::CdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank CD-R");
+ description = QCoreApplication::translate("", "Blank CD-R");
else
- description = QObject::tr("CD-R");
+ description = QCoreApplication::translate("", "CD-R");
break;
case Solid::OpticalDisc::CdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank CD-RW");
+ description = QCoreApplication::translate("", "Blank CD-RW");
else
- description = QObject::tr("CD-RW");
+ description = QCoreApplication::translate("", "CD-RW");
break;
case Solid::OpticalDisc::DvdRom:
- description = QObject::tr("DVD-ROM");
+ description = QCoreApplication::translate("", "DVD-ROM");
break;
case Solid::OpticalDisc::DvdRam:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-RAM");
+ description = QCoreApplication::translate("", "Blank DVD-RAM");
else
- description = QObject::tr("DVD-RAM");
+ description = QCoreApplication::translate("", "DVD-RAM");
break;
case Solid::OpticalDisc::DvdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-R");
+ description = QCoreApplication::translate("", "Blank DVD-R");
else
- description = QObject::tr("DVD-R");
+ description = QCoreApplication::translate("", "DVD-R");
break;
case Solid::OpticalDisc::DvdPlusRecordableDuallayer:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+R Dual-Layer");
+ description = QCoreApplication::translate("", "Blank DVD+R \
Dual-Layer"); else
- description = QObject::tr("DVD+R Dual-Layer");
+ description = QCoreApplication::translate("", "DVD+R \
Dual-Layer"); break;
case Solid::OpticalDisc::DvdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD-RW");
+ description = QCoreApplication::translate("", "Blank DVD-RW");
else
- description = QObject::tr("DVD-RW");
+ description = QCoreApplication::translate("", "DVD-RW");
break;
case Solid::OpticalDisc::DvdPlusRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+R");
+ description = QCoreApplication::translate("", "Blank DVD+R");
else
- description = QObject::tr("DVD+R");
+ description = QCoreApplication::translate("", "DVD+R");
break;
case Solid::OpticalDisc::DvdPlusRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+RW");
+ description = QCoreApplication::translate("", "Blank DVD+RW");
else
- description = QObject::tr("DVD+RW");
+ description = QCoreApplication::translate("", "DVD+RW");
break;
case Solid::OpticalDisc::DvdPlusRewritableDuallayer:
if (disc.isBlank())
- description = QObject::tr("Blank DVD+RW Dual-Layer");
+ description = QCoreApplication::translate("", "Blank DVD+RW \
Dual-Layer"); else
- description = QObject::tr("DVD+RW Dual-Layer");
+ description = QCoreApplication::translate("", "DVD+RW \
Dual-Layer"); break;
case Solid::OpticalDisc::BluRayRom:
- description = QObject::tr("BD-ROM");
+ description = QCoreApplication::translate("", "BD-ROM");
break;
case Solid::OpticalDisc::BluRayRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank BD-R");
+ description = QCoreApplication::translate("", "Blank BD-R");
else
- description = QObject::tr("BD-R");
+ description = QCoreApplication::translate("", "BD-R");
break;
case Solid::OpticalDisc::BluRayRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank BD-RE");
+ description = QCoreApplication::translate("", "Blank BD-RE");
else
- description = QObject::tr("BD-RE");
+ description = QCoreApplication::translate("", "BD-RE");
break;
case Solid::OpticalDisc::HdDvdRom:
- description = QObject::tr("HD DVD-ROM");
+ description = QCoreApplication::translate("", "HD DVD-ROM");
break;
case Solid::OpticalDisc::HdDvdRecordable:
if (disc.isBlank())
- description = QObject::tr("Blank HD DVD-R");
+ description = QCoreApplication::translate("", "Blank HD DVD-R");
else
- description = QObject::tr("HD DVD-R");
+ description = QCoreApplication::translate("", "HD DVD-R");
break;
case Solid::OpticalDisc::HdDvdRewritable:
if (disc.isBlank())
- description = QObject::tr("Blank HD DVD-RW");
+ description = QCoreApplication::translate("", "Blank HD \
DVD-RW"); else
- description = QObject::tr("HD DVD-RW");
+ description = QCoreApplication::translate("", "HD DVD-RW");
break;
}
// Special case for pure audio disc
if (disc.availableContent() == Solid::OpticalDisc::Audio)
- description = QObject::tr("Audio CD");
+ description = QCoreApplication::translate("", "Audio CD");
return description;
}
@@ -489,33 +489,33 @@ QString Device::volumeDescription() const
if (isEncryptedContainer())
{
if (!size_str.isEmpty())
- description = QObject::tr("%1 Encrypted Container", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", "%1 \
Encrypted Container", "%1 is the size").arg(size_str); else
- description = QObject::tr("Encrypted Container");
+ description = QCoreApplication::translate("", "Encrypted Container");
}
else if (drive_type == Solid::StorageDrive::HardDisk && !drive_is_removable)
{
if (!size_str.isEmpty())
{
if (drive_is_hotpluggable)
- description = QObject::tr("%1 External Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 External Hard Drive", "%1 is the size").arg(size_str); else
- description = QObject::tr("%1 Hard Drive", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", \
"%1 Hard Drive", "%1 is the size").arg(size_str); }
else
{
if (drive_is_hotpluggable)
- description = QObject::tr("External Hard Drive");
+ description = QCoreApplication::translate("", "External Hard \
Drive"); else
- description = QObject::tr("Hard Drive");
+ description = QCoreApplication::translate("", "Hard Drive");
}
}
else
{
if (drive_is_removable)
- description = QObject::tr("%1 Removable Media", "%1 is the \
size").arg(size_str); + description = QCoreApplication::translate("", "%1 \
Removable Media", "%1 is the size").arg(size_str); else
- description = QObject::tr("%1 Media", "%1 is the size").arg(size_str);
+ description = QCoreApplication::translate("", "%1 Media", "%1 is the \
size").arg(size_str); }
return description;
@@ -780,33 +780,33 @@ void Device::slotInterfacesRemoved(const QDBusObjectPath \
&object_path, const QSt QString Device::errorToString(const QString & error) const
{
if (error == UD2_ERROR_UNAUTHORIZED || error == UD2_ERROR_NOT_AUTHORIZED)
- return QObject::tr("You are not authorized to perform this operation");
+ return QCoreApplication::translate("", "You are not authorized to perform \
this operation"); else if (error == UD2_ERROR_BUSY)
- return QObject::tr("The device is currently busy");
+ return QCoreApplication::translate("", "The device is currently busy");
else if (error == UD2_ERROR_FAILED)
- return QObject::tr("The requested operation has failed");
+ return QCoreApplication::translate("", "The requested operation has \
failed"); else if (error == UD2_ERROR_CANCELED)
- return QObject::tr("The requested operation has been canceled");
+ return QCoreApplication::translate("", "The requested operation has been \
canceled"); else if (error == UD2_ERROR_INVALID_OPTION)
- return QObject::tr("An invalid or malformed option has been given");
+ return QCoreApplication::translate("", "An invalid or malformed option has \
been given"); else if (error == UD2_ERROR_MISSING_DRIVER)
- return QObject::tr("The kernel driver for this filesystem type is not \
available"); + return QCoreApplication::translate("", "The kernel driver for \
this filesystem type is not available"); else if (error == \
UD2_ERROR_ALREADY_MOUNTED)
- return QObject::tr("The device is already mounted");
+ return QCoreApplication::translate("", "The device is already mounted");
else if (error == UD2_ERROR_NOT_MOUNTED)
- return QObject::tr("The device is not mounted");
+ return QCoreApplication::translate("", "The device is not mounted");
else if (error == UD2_ERROR_MOUNTED_BY_OTHER_USER)
- return QObject::tr("The device is mounted by another user");
+ return QCoreApplication::translate("", "The device is mounted by another \
user"); else if (error == UD2_ERROR_ALREADY_UNMOUNTING)
- return QObject::tr("The device is already unmounting");
+ return QCoreApplication::translate("", "The device is already unmounting");
else if (error == UD2_ERROR_TIMED_OUT)
- return QObject::tr("The operation timed out");
+ return QCoreApplication::translate("", "The operation timed out");
else if (error == UD2_ERROR_WOULD_WAKEUP)
- return QObject::tr("The operation would wake up a disk that is in a \
deep-sleep state"); + return QCoreApplication::translate("", "The operation \
would wake up a disk that is in a deep-sleep state"); else if (error == \
UD2_ERROR_ALREADY_CANCELLED)
- return QObject::tr("The operation has already been canceled");
+ return QCoreApplication::translate("", "The operation has already been \
canceled"); else
- return QObject::tr("An unspecified error has occurred");
+ return QCoreApplication::translate("", "An unspecified error has occurred");
}
Solid::ErrorType Device::errorToSolidError(const QString & error) const
diff --git a/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp \
b/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp index 0a77c16..46d934e \
100644
--- a/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp
+++ b/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp
@@ -20,6 +20,7 @@
#include "udisksmanager.h"
+#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
#include <QtDBus>
@@ -81,8 +82,8 @@ QObject* Manager::createDevice(const QString& udi)
if (udi==udiPrefix()) {
RootDevice *root = new RootDevice(udi);
- root->setProduct(tr("Storage"));
- root->setDescription(tr("Storage devices"));
+ root->setProduct(QCoreApplication::translate("", "Storage"));
+ root->setDescription(QCoreApplication::translate("", "Storage devices"));
root->setIcon("server-database"); // Obviously wasn't meant for that, but \
maps nicely in oxygen icon set :-p
return root;
diff --git a/tier1/solid/src/solid/backends/upnp/upnpdevicemanager.cpp \
b/tier1/solid/src/solid/backends/upnp/upnpdevicemanager.cpp index 985afb0..e3cf299 \
100644
--- a/tier1/solid/src/solid/backends/upnp/upnpdevicemanager.cpp
+++ b/tier1/solid/src/solid/backends/upnp/upnpdevicemanager.cpp
@@ -21,6 +21,7 @@
#include "upnpdevicemanager.h"
#include "upnpdevice.h"
+#include <QtCore/QCoreApplication>
#include <QtCore/QtDebug>
#include <QtCore/QList>
#include <QtCore/QMap>
@@ -101,8 +102,8 @@ QObject *UPnPDeviceManager::createDevice(const QString& udi)
if (udi==udiPrefix()) {
RootDevice *root = new RootDevice(udiPrefix());
- root->setProduct(tr("UPnP Devices"));
- root->setDescription(tr("UPnP devices detected on your network"));
+ root->setProduct(QCoreApplication::translate("", "UPnP Devices"));
+ root->setDescription(QCoreApplication::translate("", "UPnP devices detected \
on your network")); root->setIcon("network-server");
return root;
diff --git a/tier1/solid/src/solid/backends/upower/upowerdevice.cpp \
b/tier1/solid/src/solid/backends/upower/upowerdevice.cpp index 39eec4f..498f68f \
100644
--- a/tier1/solid/src/solid/backends/upower/upowerdevice.cpp
+++ b/tier1/solid/src/solid/backends/upower/upowerdevice.cpp
@@ -29,6 +29,7 @@
#include <solid/genericinterface.h>
#include <solid/device.h>
+#include <QtCore/QCoreApplication>
#include <QtCore/QStringList>
#include <QtCore/QDebug>
#include <QtDBus/QDBusPendingReply>
@@ -99,9 +100,9 @@ QStringList UPowerDevice::emblems() const
QString UPowerDevice::description() const
{
if (queryDeviceInterface(Solid::DeviceInterface::AcAdapter))
- return QObject::tr("A/C Adapter");
+ return QCoreApplication::translate("", "A/C Adapter");
else if (queryDeviceInterface(Solid::DeviceInterface::Battery))
- return QObject::tr("%1 Battery", "%1 is battery \
technology").arg(batteryTechnology()); + return \
QCoreApplication::translate("", "%1 Battery", "%1 is battery \
technology").arg(batteryTechnology()); else
return product();
}
@@ -112,19 +113,19 @@ QString UPowerDevice::batteryTechnology() const
switch (tech)
{
case 1:
- return QObject::tr("Lithium Ion", "battery technology");
+ return QCoreApplication::translate("", "Lithium Ion", "battery technology");
case 2:
- return QObject::tr("Lithium Polymer", "battery technology");
+ return QCoreApplication::translate("", "Lithium Polymer", "battery \
technology"); case 3:
- return QObject::tr("Lithium Iron Phosphate", "battery technology");
+ return QCoreApplication::translate("", "Lithium Iron Phosphate", "battery \
technology"); case 4:
- return QObject::tr("Lead Acid", "battery technology");
+ return QCoreApplication::translate("", "Lead Acid", "battery technology");
case 5:
- return QObject::tr("Nickel Cadmium", "battery technology");
+ return QCoreApplication::translate("", "Nickel Cadmium", "battery \
technology"); case 6:
- return QObject::tr("Nickel Metal Hydride", "battery technology");
+ return QCoreApplication::translate("", "Nickel Metal Hydride", "battery \
technology"); default:
- return QObject::tr("Unknown", "battery technology");
+ return QCoreApplication::translate("", "Unknown", "battery technology");
}
}
diff --git a/tier1/solid/src/solid/backends/upower/upowermanager.cpp \
b/tier1/solid/src/solid/backends/upower/upowermanager.cpp index c17afb9..ee198a0 \
100644
--- a/tier1/solid/src/solid/backends/upower/upowermanager.cpp
+++ b/tier1/solid/src/solid/backends/upower/upowermanager.cpp
@@ -23,6 +23,7 @@
#include "upowerdevice.h"
#include "upower.h"
+#include <QtCore/QCoreApplication>
#include <QtDBus/QDBusReply>
#include <QtCore/QDebug>
#include <QtDBus/QDBusMetaType>
@@ -80,8 +81,8 @@ QObject* UPowerManager::createDevice(const QString& udi)
if (udi==udiPrefix()) {
RootDevice *root = new RootDevice(udiPrefix());
- root->setProduct(tr("Power Management"));
- root->setDescription(tr("Batteries and other sources of power"));
+ root->setProduct(QCoreApplication::translate("", "Power Management"));
+ root->setDescription(QCoreApplication::translate("", "Batteries and other \
sources of power")); root->setIcon("preferences-system-power-management");
return root;
diff --git a/tier1/solid/src/solid/backends/wmi/wmibattery.cpp \
b/tier1/solid/src/solid/backends/wmi/wmibattery.cpp index 4319ab5..2e36ecd 100644
--- a/tier1/solid/src/solid/backends/wmi/wmibattery.cpp
+++ b/tier1/solid/src/solid/backends/wmi/wmibattery.cpp
@@ -93,17 +93,17 @@ QString Battery::batteryTechnology() const
switch (tech)
{
case 3:
- return QObject::tr("Lead Acid", "battery technology");
+ return QCoreApplication::translate("", "Lead Acid", "battery technology");
case 4:
- return QObject::tr("Nickel Cadmium", "battery technology");
+ return QCoreApplication::translate("", "Nickel Cadmium", "battery \
technology"); case 5:
- return QObject::tr("Nickel Metal Hydride", "battery technology");
+ return QCoreApplication::translate("", "Nickel Metal Hydride", "battery \
technology"); case 6:
- return QObject::tr("Lithium Ion", "battery technology");
+ return QCoreApplication::translate("", "Lithium Ion", "battery technology");
case 8:
- return QObject::tr("Lithium Polymer", "battery technology");
+ return QCoreApplication::translate("", "Lithium Polymer", "battery \
technology"); default:
- return QObject::tr("Unknown", "battery technology");
+ return QCoreApplication::translate("", "Unknown", "battery technology");
}
}
diff --git a/tier1/solid/src/solid/backends/wmi/wmidevice.cpp \
b/tier1/solid/src/solid/backends/wmi/wmidevice.cpp index 157c6a9..bc77a06 100644
--- a/tier1/solid/src/solid/backends/wmi/wmidevice.cpp
+++ b/tier1/solid/src/solid/backends/wmi/wmidevice.cpp
@@ -463,12 +463,12 @@ QString WmiDevice::description() const
case Solid::DeviceInterface::OpticalDisc:
return property("VolumeName").toString();
case Solid::DeviceInterface::AcAdapter:
- return QObject::tr("A/C Adapter");
+ return QCoreApplication::translate("", "A/C Adapter");
case Solid::DeviceInterface::Battery:
{
WmiDevice dev(udi());
Battery bat(&dev);
- return QObject::tr("%1 Battery", "%1 is battery \
technology").arg(bat.batteryTechnology()); + return \
QCoreApplication::translate("", "%1 Battery", "%1 is battery \
technology").arg(bat.batteryTechnology()); }
default:
return product();
diff --git a/tier1/solid/src/solid/deviceinterface.cpp \
b/tier1/solid/src/solid/deviceinterface.cpp index 6c4d3f1..0cfc8e8 100644
--- a/tier1/solid/src/solid/deviceinterface.cpp
+++ b/tier1/solid/src/solid/deviceinterface.cpp
@@ -23,6 +23,7 @@
#include <solid/ifaces/deviceinterface.h>
+#include <QtCore/QCoreApplication>
#include <QtCore/QMetaEnum>
@@ -66,49 +67,49 @@ QString Solid::DeviceInterface::typeDescription(Type type)
switch (type)
{
case Unknown:
- return QObject::tr("Unknown", "Unknown device type");
+ return QCoreApplication::translate("", "Unknown", "Unknown device type");
case GenericInterface:
- return QObject::tr("Generic Interface", "Generic Interface device type");
+ return QCoreApplication::translate("", "Generic Interface", "Generic \
Interface device type"); case Processor:
- return QObject::tr("Processor", "Processor device type");
+ return QCoreApplication::translate("", "Processor", "Processor device \
type"); case Block:
- return QObject::tr("Block", "Block device type");
+ return QCoreApplication::translate("", "Block", "Block device type");
case StorageAccess:
- return QObject::tr("Storage Access", "Storage Access device type");
+ return QCoreApplication::translate("", "Storage Access", "Storage Access \
device type"); case StorageDrive:
- return QObject::tr("Storage Drive", "Storage Drive device type");
+ return QCoreApplication::translate("", "Storage Drive", "Storage Drive \
device type"); case OpticalDrive:
- return QObject::tr("Optical Drive", "Optical Drive device type");
+ return QCoreApplication::translate("", "Optical Drive", "Optical Drive \
device type"); case StorageVolume:
- return QObject::tr("Storage Volume", "Storage Volume device type");
+ return QCoreApplication::translate("", "Storage Volume", "Storage Volume \
device type"); case OpticalDisc:
- return QObject::tr("Optical Disc", "Optical Disc device type");
+ return QCoreApplication::translate("", "Optical Disc", "Optical Disc device \
type"); case Camera:
- return QObject::tr("Camera", "Camera device type");
+ return QCoreApplication::translate("", "Camera", "Camera device type");
case PortableMediaPlayer:
- return QObject::tr("Portable Media Player", "Portable Media Player device \
type"); + return QCoreApplication::translate("", "Portable Media Player", \
"Portable Media Player device type"); case NetworkInterface:
- return QObject::tr("Network Interface", "Network Interface device type");
+ return QCoreApplication::translate("", "Network Interface", "Network \
Interface device type"); case AcAdapter:
- return QObject::tr("Ac Adapter", "Ac Adapter device type");
+ return QCoreApplication::translate("", "Ac Adapter", "Ac Adapter device \
type"); case Battery:
- return QObject::tr("Battery", "Battery device type");
+ return QCoreApplication::translate("", "Battery", "Battery device type");
case Button:
- return QObject::tr("Button", "Button device type");
+ return QCoreApplication::translate("", "Button", "Button device type");
case AudioInterface:
- return QObject::tr("Audio Interface", "Audio Interface device type");
+ return QCoreApplication::translate("", "Audio Interface", "Audio Interface \
device type"); case DvbInterface:
- return QObject::tr("Dvb Interface", "Dvb Interface device type");
+ return QCoreApplication::translate("", "Dvb Interface", "Dvb Interface \
device type"); case Video:
- return QObject::tr("Video", "Video device type");
+ return QCoreApplication::translate("", "Video", "Video device type");
case SerialInterface:
- return QObject::tr("Serial Interface", "Serial Interface device type");
+ return QCoreApplication::translate("", "Serial Interface", "Serial Interface \
device type"); case SmartCardReader:
- return QObject::tr("Smart Card Reader", "Smart Card Reader device type");
+ return QCoreApplication::translate("", "Smart Card Reader", "Smart Card \
Reader device type"); case InternetGateway:
- return QObject::tr("Internet Gateway Device", "Internet Gateway device \
type"); + return QCoreApplication::translate("", "Internet Gateway Device", \
"Internet Gateway device type"); case NetworkShare:
- return QObject::tr("Network Share", "Network Share device type");
+ return QCoreApplication::translate("", "Network Share", "Network Share \
device type"); case Last:
return QString();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic