← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kde4libs/oneiric-proposed

« back to all changes in this revision

Viewing changes to solid/solid/backends/hal/haldevice.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2011-07-08 00:08:34 UTC
  • mto: This revision was merged to the branch mainline in revision 247.
  • Revision ID: package-import@ubuntu.com-20110708000834-dr9a8my4iml90qe5
Tags: upstream-4.6.90
Import upstream version 4.6.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
solid/solid/backends/hal/haldevice.cpp
513
513
        break;
514
514
    case Solid::DeviceInterface::InternetGateway:
515
515
        break;
 
516
    case Solid::DeviceInterface::NetworkShare:
 
517
        break;
516
518
    case Solid::DeviceInterface::Unknown:
517
519
    case Solid::DeviceInterface::Last:
518
520
        break;
615
617
            second = QObject::tr("/HD DVD-RW", "Second item of %1%2 Drive sentence");
616
618
 
617
619
        if (drive_is_hotpluggable) {
618
 
            description = QObject::tr("External %1%2 Drive").arg(first).arg(second);
 
620
            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);
619
621
        } else {
620
 
            description = QObject::tr("%1%2 Drive").arg(first).arg(second);
 
622
            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);
621
623
        }
622
624
 
623
625
        return description;